Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ds/avoid-overflow-in-midpoint-computation' | Junio C Hamano | 2017-10-11 | 3 | -4/+4 |
|\ | |||||
| * | cleanup: fix possible overflow errors in binary search | Derrick Stolee | 2017-10-10 | 3 | -4/+4 |
* | | Merge branch 'ks/branch-tweak-error-message-for-extra-args' | Junio C Hamano | 2017-10-07 | 1 | -3/+3 |
|\ \ | |||||
| * | | branch: change the error messages to be more meaningful | Kaartic Sivaraam | 2017-10-04 | 1 | -3/+3 |
* | | | Merge branch 'jk/ui-color-always-to-auto' | Junio C Hamano | 2017-10-07 | 2 | -0/+2 |
|\ \ \ | |||||
| * \ \ | Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-auto | Junio C Hamano | 2017-10-04 | 2 | -0/+2 |
| |\ \ \ | |||||
| | * | | | provide --color option for all ref-filter users | Jeff King | 2017-10-04 | 2 | -0/+2 |
* | | | | | Merge branch 'ma/builtin-unleak' | Junio C Hamano | 2017-10-07 | 5 | -4/+11 |
|\ \ \ \ \ | |||||
| * | | | | | builtin/: add UNLEAKs | Martin Ågren | 2017-10-02 | 5 | -4/+11 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'sb/branch-avoid-repeated-strbuf-release' | Junio C Hamano | 2017-10-07 | 1 | -2/+3 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | branch: reset instead of release a strbuf | Stefan Beller | 2017-10-04 | 1 | -2/+3 |
| |/ / / | |||||
* | | | | Merge branch 'rs/cleanup-strbuf-users' | Junio C Hamano | 2017-10-05 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | use strbuf_addstr() for adding strings to strbufs | René Scharfe | 2017-10-02 | 1 | -1/+1 |
* | | | | | Merge branch 'rs/resolve-ref-optional-result' | Junio C Hamano | 2017-10-05 | 2 | -4/+2 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | refs: pass NULL to resolve_refdup() if hash is not needed | René Scharfe | 2017-10-01 | 2 | -4/+2 |
* | | | | | Merge branch 'jk/read-in-full' | Junio C Hamano | 2017-10-03 | 2 | -5/+25 |
|\ \ \ \ \ | |||||
| * | | | | | worktree: check the result of read_in_full() | Jeff King | 2017-09-27 | 1 | -1/+18 |
| * | | | | | worktree: use xsize_t to access file size | Jeff King | 2017-09-27 | 1 | -2/+3 |
| * | | | | | distinguish error versus short read from read_in_full() | Jeff King | 2017-09-27 | 1 | -1/+3 |
| * | | | | | prefer "!=" when checking read_in_full() result | Jeff King | 2017-09-27 | 1 | -1/+1 |
* | | | | | | Merge branch 'jk/no-optional-locks' | Junio C Hamano | 2017-10-03 | 1 | -1/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git: add --no-optional-locks option | Jeff King | 2017-09-27 | 1 | -1/+4 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'sd/branch-copy' | Junio C Hamano | 2017-10-03 | 1 | -15/+47 |
|\ \ \ \ \ \ | |||||
| * | | | | | | branch: fix "copy" to never touch HEAD | Junio C Hamano | 2017-09-24 | 1 | -6/+3 |
| * | | | | | | branch: add a --copy (-c) option to go with --move (-m) | Sahil Dua | 2017-06-19 | 1 | -16/+51 |
* | | | | | | | Merge branch 'bc/rev-parse-parseopt-fix' | Junio C Hamano | 2017-10-03 | 1 | -4/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rev-parse parseopt: interpret any whitespace as start of help text | Brandon Casey | 2017-09-19 | 1 | -2/+10 |
| * | | | | | | | rev-parse parseopt: do not search help text for flag chars | Brandon Casey | 2017-09-19 | 1 | -2/+4 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'js/rebase-i-final' | Junio C Hamano | 2017-10-03 | 1 | -1/+28 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | rebase -i: rearrange fixup/squash lines using the rebase--helper | Johannes Schindelin | 2017-07-28 | 1 | -1/+5 |
| * | | | | | | rebase -i: skip unnecessary picks using the rebase--helper | Johannes Schindelin | 2017-07-28 | 1 | -1/+5 |
| * | | | | | | rebase -i: check for missing commits in the rebase--helper | Johannes Schindelin | 2017-07-28 | 1 | -1/+6 |
| * | | | | | | rebase -i: also expand/collapse the SHA-1s via the rebase--helper | Johannes Schindelin | 2017-07-28 | 1 | -1/+9 |
| * | | | | | | rebase -i: generate the script via rebase--helper | Johannes Schindelin | 2017-07-28 | 1 | -1/+7 |
* | | | | | | | Merge branch 'ma/leakplugs' | Junio C Hamano | 2017-09-29 | 5 | -17/+23 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | object_array: add and use `object_array_pop()` | Martin Ågren | 2017-09-24 | 3 | -9/+3 |
| * | | | | | | | object_array: use `object_array_clear()`, not `free()` | Martin Ågren | 2017-09-24 | 1 | -2/+2 |
| * | | | | | | | leak_pending: use `object_array_clear()`, not `free()` | Martin Ågren | 2017-09-24 | 1 | -1/+8 |
| * | | | | | | | builtin/commit: fix memory leak in `prepare_index()` | Martin Ågren | 2017-09-24 | 1 | -5/+10 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'rj/no-sign-compare' | Junio C Hamano | 2017-09-29 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | ALLOC_GROW: avoid -Wsign-compare warnings | Ramsay Jones | 2017-09-22 | 1 | -2/+2 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jt/fast-export-copy-modify-fix' | Junio C Hamano | 2017-09-29 | 1 | -14/+32 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fast-export: do not copy from modified file | Jonathan Tan | 2017-09-21 | 1 | -14/+32 |
* | | | | | | | | Merge branch 'mk/describe-match-with-all' | Junio C Hamano | 2017-09-29 | 1 | -12/+17 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | describe: teach --match to handle branches and remotes | Max Kirillov | 2017-09-20 | 1 | -12/+17 |
| * | | | | | | | | Merge branch 'jk/describe-omit-some-refs' into mk/describe-match-with-all | Junio C Hamano | 2017-09-20 | 1 | -3/+6 |
| |\ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ | Merge branch 'rs/resolve-ref-optional-result' | Junio C Hamano | 2017-09-28 | 6 | -14/+7 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | refs: pass NULL to resolve_ref_unsafe() if hash is not needed | René Scharfe | 2017-09-24 | 6 | -14/+7 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'jk/fallthrough' | Junio C Hamano | 2017-09-28 | 4 | -1/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | consistently use "fallthrough" comments in switches | Jeff King | 2017-09-22 | 4 | -1/+4 |
| |/ / / / / / / / |