aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'sb/submodule-helper'Junio C Hamano2015-10-05
|\
| * submodule: rewrite `module_clone` shell function in CStefan Beller2015-09-08
| * submodule: rewrite `module_name` shell function in CStefan Beller2015-09-03
| * submodule: rewrite `module_list` shell function in CStefan Beller2015-09-03
| * Merge 'hv/submodule-config' to 'sb/submodule-helper'Junio C Hamano2015-08-19
| |\
* | \ Merge branch 'kn/for-each-tag'Junio C Hamano2015-10-05
|\ \ \
| * | | tag.c: implement '--merged' and '--no-merged' optionsKarthik Nayak2015-09-17
| * | | tag.c: implement '--format' optionKarthik Nayak2015-09-17
| * | | tag.c: use 'ref-filter' APIsKarthik Nayak2015-09-17
| * | | tag.c: use 'ref-filter' data structuresKarthik Nayak2015-09-17
| * | | ref-filter: add option to match literal patternKarthik Nayak2015-09-17
| * | | ref-filter: add support for %(contents:lines=X)Karthik Nayak2015-09-17
| * | | Merge 'jk/git-path' into kn/for-each-tagJunio C Hamano2015-08-24
| |\ \ \ | | |/ /
| * | | Merge 'kn/for-each-tag-branch' into kn/for-each-tagJunio C Hamano2015-08-24
| |\ \ \
* | \ \ \ Merge branch 'jk/date-local'Junio C Hamano2015-10-05
|\ \ \ \ \
| * | | | | date: make "local" orthogonal to date formatJeff King2015-09-03
* | | | | | Merge branch 'jc/rerere'Junio C Hamano2015-10-05
|\ \ \ \ \ \
| * | | | | | rerere: use "struct rerere_id" instead of "char *" for conflict IDJunio C Hamano2015-07-24
| * | | | | | rerere: call conflict-ids IDsJunio C Hamano2015-07-24
* | | | | | | Merge branch 'kn/for-each-tag-branch'Junio C Hamano2015-10-05
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | for-each-ref: add '--contains' optionKarthik Nayak2015-08-03
| * | | | | | ref-filter: implement '--contains' optionKarthik Nayak2015-08-03
| * | | | | | parse-options.h: add macros for '--contains' optionKarthik Nayak2015-08-03
| * | | | | | parse-option: rename parse_opt_with_commit()Karthik Nayak2015-08-03
| * | | | | | for-each-ref: add '--merged' and '--no-merged' optionsKarthik Nayak2015-08-03
| * | | | | | ref-filter: implement '--merged' and '--no-merged' optionsKarthik Nayak2015-08-03
| * | | | | | ref-filter: add parse_opt_merge_filter()Karthik Nayak2015-08-03
| * | | | | | for-each-ref: add '--points-at' optionKarthik Nayak2015-08-03
| * | | | | | ref-filter: implement '--points-at' optionKarthik Nayak2015-08-03
| * | | | | | tag: libify parse_opt_points_at()Karthik Nayak2015-08-03
* | | | | | | Merge branch 'ah/show-ref-usage-string'Junio C Hamano2015-09-14
|\ \ \ \ \ \ \
| * | | | | | | show-ref: place angle brackets around variables in usage stringAlex Henrie2015-08-31
* | | | | | | | Merge branch 'rt/help-strings-fix'Junio C Hamano2015-09-14
|\ \ \ \ \ \ \ \
| * | | | | | | | tag, update-ref: improve description of option "create-reflog"Ralf Thielow2015-09-11
| * | | | | | | | pull: don't mark values for option "rebase" for translationRalf Thielow2015-09-11
* | | | | | | | | Merge branch 'gb/apply-comment-typofix'Junio C Hamano2015-09-14
* | | | | | | | | Sync with 2.5.2Junio C Hamano2015-09-09
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Sync with 2.4.9Junio C Hamano2015-09-04
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Sync with 2.3.9Junio C Hamano2015-09-04
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Sync with 2.2.3Junio C Hamano2015-09-04
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | | * | | | | | | show-branch: use a strbuf for reflog descriptionsJeff King2015-09-04
| * | | | | | | | | | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd...Junio C Hamano2015-09-03
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/calloc-pathspec' into maintJunio C Hamano2015-09-03
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rev-list-has-no-notes' into maintJunio C Hamano2015-09-03
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/get-remote-group-fix' into maintJunio C Hamano2015-09-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jc/builtin-am-signoff-regression-fix'Junio C Hamano2015-09-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | am: match --signoff to the original scripted versionJunio C Hamano2015-09-06
* | | | | | | | | | | | | | | Merge branch 'jk/am-rerere-lock-fix'Junio C Hamano2015-09-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | rerere: release lockfile in non-writing functionsJeff King2015-09-01
* | | | | | | | | | | | | | | | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd...Junio C Hamano2015-09-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |