summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'wk/pull-signoff'Junio C Hamano2017-11-061-0/+6
|\
| * pull: pass --signoff/--no-signoff to "git merge"wk/pull-signoffW. Trevor King2017-10-131-0/+6
* | Merge branch 'pc/submodule-helper'Junio C Hamano2017-11-061-17/+256
|\ \
| * | submodule: port submodule subcommand 'status' from shell to CPrathamesh Chavan2017-10-071-0/+198
| * | submodule--helper: introduce for_each_listed_submodule()Prathamesh Chavan2017-10-071-5/+35
| * | submodule--helper: introduce get_submodule_displaypath()Prathamesh Chavan2017-10-021-12/+23
* | | Merge branch 'pb/bisect-helper'Junio C Hamano2017-11-061-6/+131
|\ \ \
| * | | bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in Cpb/bisect-helperPranit Bauva2017-10-061-1/+33
| * | | bisect--helper: `bisect_clean_state` shell function in CPranit Bauva2017-10-061-1/+9
| * | | bisect--helper: `write_terms` shell function in CPranit Bauva2017-10-061-7/+29
| * | | bisect--helper: rewrite `check_term_format` shell function in CPranit Bauva2017-10-061-1/+59
| * | | bisect--helper: use OPT_CMDMODE instead of OPT_BOOLPranit Bauva2017-10-061-6/+11
* | | | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-11-061-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'Junio C Hamano2017-11-061-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
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/misc-resolve-ref-unsafe-fixes'Junio C Hamano2017-11-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | remote: handle broken symrefsJeff King2017-10-211-1/+1
* | | | | | | | | | | | | | | Merge branch 'jc/no-cmd-as-subroutine'Junio C Hamano2017-11-062-13/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | merge-ours: do not use cmd_*() as a subroutinejc/no-cmd-as-subroutineJunio C Hamano2017-10-111-9/+7
| * | | | | | | | | | | | | | | describe: do not use cmd_*() as a subroutineJunio C Hamano2017-10-111-4/+11
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ma/lockfile-fixes'Junio C Hamano2017-11-068-45/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | read-cache: leave lock in right state in `write_locked_index()`Martin Ågren2017-10-071-1/+0
| * | | | | | | | | | | | | | read-cache: drop explicit `CLOSE_LOCK`-flagMartin Ågren2017-10-071-5/+5
| * | | | | | | | | | | | | | apply: move lockfile into `apply_state`Martin Ågren2017-10-062-5/+2
| * | | | | | | | | | | | | | checkout-index: simplify locking logicMartin Ågren2017-10-061-5/+3
| * | | | | | | | | | | | | | treewide: prefer lockfiles on the stackMartin Ågren2017-10-064-29/+23
* | | | | | | | | | | | | | | 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
| |/ / / / / / / / / / / /
View Lorry Controller Status