aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
...
* | | | | | | | | | | | | | | | Merge branch 'sd/branch-copy'Junio C Hamano2017-10-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | branch: fix "copy" to never touch HEADJunio C Hamano2017-09-24
| * | | | | | | | | | | | | | | | branch: add a --copy (-c) option to go with --move (-m)Sahil Dua2017-06-18
* | | | | | | | | | | | | | | | | Merge branch 'bc/rev-parse-parseopt-fix'Junio C Hamano2017-10-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | rev-parse parseopt: interpret any whitespace as start of help textBrandon Casey2017-09-19
| * | | | | | | | | | | | | | | | | rev-parse parseopt: do not search help text for flag charsBrandon Casey2017-09-19
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | rebase -i: rearrange fixup/squash lines using the rebase--helperJohannes Schindelin2017-07-27
| * | | | | | | | | | | | | | | | rebase -i: skip unnecessary picks using the rebase--helperJohannes Schindelin2017-07-27
| * | | | | | | | | | | | | | | | rebase -i: check for missing commits in the rebase--helperJohannes Schindelin2017-07-27
| * | | | | | | | | | | | | | | | rebase -i: also expand/collapse the SHA-1s via the rebase--helperJohannes Schindelin2017-07-27
| * | | | | | | | | | | | | | | | rebase -i: generate the script via rebase--helperJohannes Schindelin2017-07-27
* | | | | | | | | | | | | | | | | Merge branch 'ma/leakplugs'Junio C Hamano2017-09-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | object_array: add and use `object_array_pop()`Martin Ågren2017-09-24
| * | | | | | | | | | | | | | | | | object_array: use `object_array_clear()`, not `free()`Martin Ågren2017-09-24
| * | | | | | | | | | | | | | | | | leak_pending: use `object_array_clear()`, not `free()`Martin Ågren2017-09-24
| * | | | | | | | | | | | | | | | | builtin/commit: fix memory leak in `prepare_index()`Martin Ågren2017-09-24
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'rj/no-sign-compare'Junio C Hamano2017-09-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | ALLOC_GROW: avoid -Wsign-compare warningsRamsay Jones2017-09-22
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'jt/fast-export-copy-modify-fix'Junio C Hamano2017-09-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | fast-export: do not copy from modified fileJonathan Tan2017-09-21
* | | | | | | | | | | | | | | | | | Merge branch 'mk/describe-match-with-all'Junio C Hamano2017-09-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | describe: teach --match to handle branches and remotesMax Kirillov2017-09-20
| * | | | | | | | | | | | | | | | | | Merge branch 'jk/describe-omit-some-refs' into mk/describe-match-with-allJunio C Hamano2017-09-20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'rs/resolve-ref-optional-result'Junio C Hamano2017-09-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | refs: pass NULL to resolve_ref_unsafe() if hash is not neededRené Scharfe2017-09-24
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'jk/fallthrough'Junio C Hamano2017-09-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | consistently use "fallthrough" comments in switchesJeff King2017-09-22
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'jk/diff-blob'Junio C Hamano2017-09-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | cat-file: handle NULL object_context.pathJeff King2017-09-22
* | | | | | | | | | | | | | | | | | Merge branch 'jk/describe-omit-some-refs'Junio C Hamano2017-09-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | describe: fix matching to actually match all patternsMax Kirillov2017-09-17
* | | | | | | | | | | | | | | | | | Merge branch 'ow/rev-parse-is-shallow-repo'Junio C Hamano2017-09-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | rev-parse: rev-parse: add --is-shallow-repositoryØystein Walle2017-09-19
| | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'aw/gc-lockfile-fscanf-fix'Junio C Hamano2017-09-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | gc: call fscanf() with %<len>s, not %<len>c, when reading hostnameJunio C Hamano2017-09-17
* | | | | | | | | | | | | | | | | | Merge branch 'ks/help-alias-label'Junio C Hamano2017-09-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | help: change a message to be more preciseKaartic Sivaraam2017-09-14
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jn/per-repo-object-store-fixes'Junio C Hamano2017-09-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | pack: make packed_git_mru global a value instead of a pointerJonathan Nieder2017-09-14
* | | | | | | | | | | | | | | | | | Merge branch 'jk/write-in-full-fix'Junio C Hamano2017-09-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | avoid "write_in_full(fd, buf, len) != len" patternJeff King2017-09-14
| * | | | | | | | | | | | | | | | | get-tar-commit-id: check write_in_full() return against 0Jeff King2017-09-14
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'rs/merge-microcleanup' into maintJunio C Hamano2017-09-10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rj/add-chmod-error-message' into maintJunio C Hamano2017-09-10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/killed-merge' into maintJunio C Hamano2017-09-10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/fsck-obj-leakfix' into maintJunio C Hamano2017-09-10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pw/am-signoff' into maintJunio C Hamano2017-09-10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bw/clone-recursive-quiet' into maintJunio C Hamano2017-09-10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pw/sequence-rerere-autoupdate' into maintJunio C Hamano2017-09-10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \