summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* checkout: avoid using the rev_info flag leak_pendingRené Scharfe2017-12-281-12/+1
* Merge branch 'tz/notes-error-to-stderr' into maintJunio C Hamano2017-12-061-4/+4
|\
| * notes: send "Automatic notes merge failed" messages to stderrtz/notes-error-to-stderrTodd Zullinger2017-11-151-4/+4
* | Merge branch 'sw/pull-ipv46-passthru' into maintJunio C Hamano2017-12-061-0/+12
|\ \
| * | pull: pass -4/-6 option to 'git fetch'sw/pull-ipv46-passthruShuyu Wei2017-11-211-0/+12
* | | Merge branch 'ma/reduce-heads-leakfix' into maintJunio C Hamano2017-11-275-22/+28
|\ \ \
| * | | reduce_heads: fix memory leaksma/reduce-heads-leakfixMartin Ågren2017-11-085-5/+11
| * | | builtin/merge-base: free commit listsMartin Ågren2017-11-081-18/+18
* | | | Merge branch 'ma/bisect-leakfix' into maintJunio C Hamano2017-11-271-2/+1
|\ \ \ \
| * | | | bisect: change calling-convention of `find_bisection()`Martin Ågren2017-11-061-2/+1
| |/ / /
* | | | Merge branch 'jc/check-ref-format-oor' into maintJunio C Hamano2017-11-151-2/+4
|\ \ \ \
| * | | | check-ref-format --branch: strip refs/heads/ using skip_prefixJunio C Hamano2017-10-181-2/+4
* | | | | Merge branch 'bw/grep-recurse-submodules' into maintJunio C Hamano2017-11-151-0/+2
|\ \ \ \ \
| * | | | | grep: take the read-lock when adding a submodulebw/grep-recurse-submodulesMartin Ågren2017-11-021-0/+2
* | | | | | Merge branch 'ao/check-resolve-ref-unsafe-result' into maintJunio C Hamano2017-11-151-0/+2
|\ \ \ \ \ \
| * | | | | | commit: check result of resolve_ref_unsafeao/check-resolve-ref-unsafe-resultAndrey Okoshkin2017-10-211-0/+2
| * | | | | | Merge branch 'jk/ref-filter-colors-fix' into maintJunio C Hamano2017-10-186-5/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'sb/branch-avoid-repeated-strbuf-release' into maintJunio C Hamano2017-10-181-2/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mg/timestamp-t-fix' into maintJunio C Hamano2017-10-181-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/diff-blob' into maintJunio C Hamano2017-10-181-2/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/describe-omit-some-refs' into maintJunio C Hamano2017-10-181-3/+6
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'aw/gc-lockfile-fscanf-fix' into maintJunio C Hamano2017-10-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rk/commit-tree-make-F-verbatim' into maintJunio C Hamano2017-10-181-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/packed-ref-store-prep' into maintJunio C Hamano2017-10-181-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | remote: handle broken symrefsJeff King2017-10-211-1/+1
| |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jk/ref-filter-colors-fix'Junio C Hamano2017-10-185-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | tag: respect color.ui configjk/ref-filter-colors-fixJeff 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 searchds/avoid-overflow-in-midpoint-computationDerrick 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 meaningfulks/branch-tweak-error-message-for-extra-argsKaartic 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-autojk/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 UNLEAKsma/builtin-unleakMartin Å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 strbufsb/branch-avoid-repeated-strbuf-releaseStefan 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 neededrs/resolve-ref-optional-resultRené 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()jk/read-in-fullJeff 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status