summaryrefslogtreecommitdiffstats
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/ref-filter-colors-fix'Junio C Hamano2017-10-185-5/+6
|\
| * tag: respect color.ui configJeff King2017-10-171-1/+1
| * Revert "color: check color.ui in git_default_config()"Jeff King2017-10-174-4/+5
| * Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filt...Junio C Hamano2017-10-172-0/+2
| |\
* | \ Merge branch 'ds/avoid-overflow-in-midpoint-computation'Junio C Hamano2017-10-113-4/+4
|\ \ \
| * | | cleanup: fix possible overflow errors in binary searchDerrick Stolee2017-10-103-4/+4
* | | | Merge branch 'ks/branch-tweak-error-message-for-extra-args'Junio C Hamano2017-10-071-3/+3
|\ \ \ \
| * | | | branch: change the error messages to be more meaningfulKaartic Sivaraam2017-10-041-3/+3
| | |/ / | |/| |
* | | | Merge branch 'jk/ui-color-always-to-auto'Junio C Hamano2017-10-072-0/+2
|\ \ \ \
| * \ \ \ Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-autoJunio C Hamano2017-10-042-0/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | provide --color option for all ref-filter usersJeff King2017-10-042-0/+2
* | | | | Merge branch 'ma/builtin-unleak'Junio C Hamano2017-10-075-4/+11
|\ \ \ \ \
| * | | | | builtin/: add UNLEAKsMartin Ågren2017-10-025-4/+11
| | |_|/ / | |/| | |
* | | | | Merge branch 'sb/branch-avoid-repeated-strbuf-release'Junio C Hamano2017-10-071-2/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | branch: reset instead of release a strbufStefan Beller2017-10-041-2/+3
| |/ / /
* | | | Merge branch 'rs/cleanup-strbuf-users'Junio C Hamano2017-10-051-1/+1
|\ \ \ \
| * | | | use strbuf_addstr() for adding strings to strbufsRené Scharfe2017-10-021-1/+1
* | | | | Merge branch 'rs/resolve-ref-optional-result'Junio C Hamano2017-10-052-4/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | refs: pass NULL to resolve_refdup() if hash is not neededRené Scharfe2017-10-012-4/+2
* | | | | Merge branch 'jk/read-in-full'Junio C Hamano2017-10-032-5/+25
|\ \ \ \ \
| * | | | | worktree: check the result of read_in_full()Jeff King2017-09-271-1/+18
| * | | | | worktree: use xsize_t to access file sizeJeff King2017-09-271-2/+3
| * | | | | distinguish error versus short read from read_in_full()Jeff King2017-09-271-1/+3
| * | | | | prefer "!=" when checking read_in_full() resultJeff King2017-09-271-1/+1
* | | | | | Merge branch 'jk/no-optional-locks'Junio C Hamano2017-10-031-1/+4
|\ \ \ \ \ \
| * | | | | | git: add --no-optional-locks optionJeff King2017-09-271-1/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'sd/branch-copy'Junio C Hamano2017-10-031-15/+47
|\ \ \ \ \ \
| * | | | | | branch: fix "copy" to never touch HEADJunio C Hamano2017-09-241-6/+3
| * | | | | | branch: add a --copy (-c) option to go with --move (-m)Sahil Dua2017-06-181-16/+51
* | | | | | | Merge branch 'bc/rev-parse-parseopt-fix'Junio C Hamano2017-10-031-4/+14
|\ \ \ \ \ \ \
| * | | | | | | rev-parse parseopt: interpret any whitespace as start of help textBrandon Casey2017-09-191-2/+10
| * | | | | | | rev-parse parseopt: do not search help text for flag charsBrandon Casey2017-09-191-2/+4
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-031-1/+28
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | rebase -i: rearrange fixup/squash lines using the rebase--helperJohannes Schindelin2017-07-271-1/+5
| * | | | | | rebase -i: skip unnecessary picks using the rebase--helperJohannes Schindelin2017-07-271-1/+5
| * | | | | | rebase -i: check for missing commits in the rebase--helperJohannes Schindelin2017-07-271-1/+6
| * | | | | | rebase -i: also expand/collapse the SHA-1s via the rebase--helperJohannes Schindelin2017-07-271-1/+9
| * | | | | | rebase -i: generate the script via rebase--helperJohannes Schindelin2017-07-271-1/+7
* | | | | | | Merge branch 'ma/leakplugs'Junio C Hamano2017-09-295-17/+23
|\ \ \ \ \ \ \
| * | | | | | | object_array: add and use `object_array_pop()`Martin Ågren2017-09-243-9/+3
| * | | | | | | object_array: use `object_array_clear()`, not `free()`Martin Ågren2017-09-241-2/+2
| * | | | | | | leak_pending: use `object_array_clear()`, not `free()`Martin Ågren2017-09-241-1/+8
| * | | | | | | builtin/commit: fix memory leak in `prepare_index()`Martin Ågren2017-09-241-5/+10
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'rj/no-sign-compare'Junio C Hamano2017-09-291-2/+2
|\ \ \ \ \ \ \
| * | | | | | | ALLOC_GROW: avoid -Wsign-compare warningsRamsay Jones2017-09-221-2/+2
| |/ / / / / /
* | | | | | | Merge branch 'jt/fast-export-copy-modify-fix'Junio C Hamano2017-09-291-14/+32
|\ \ \ \ \ \ \
| * | | | | | | fast-export: do not copy from modified fileJonathan Tan2017-09-211-14/+32
* | | | | | | | Merge branch 'mk/describe-match-with-all'Junio C Hamano2017-09-291-12/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | describe: teach --match to handle branches and remotesMax Kirillov2017-09-201-12/+17
| * | | | | | | | Merge branch 'jk/describe-omit-some-refs' into mk/describe-match-with-allJunio C Hamano2017-09-201-3/+6
| |\ \ \ \ \ \ \ \