aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* 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
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | commit: don't rewrite shared index unnecessarilyDavid Turner2015-08-31
| | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'jk/guess-repo-name-regression-fix' into maintJunio C Hamano2015-08-25
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'ah/reflog-typofix-in-error'Junio C Hamano2015-09-01
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | reflog: add missing single quote to error messageAlex Henrie2015-08-28
* | | | | | | | | | | | | Merge branch 'ah/read-tree-usage-string'Junio C Hamano2015-09-01
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | read-tree: replace bracket set with parentheses to clarify usageAlex Henrie2015-08-28
* | | | | | | | | | | | | | Merge branch 'ah/pack-objects-usage-strings'Junio C Hamano2015-09-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | pack-objects: place angle brackets around placeholders in usage stringsAlex Henrie2015-08-28
* | | | | | | | | | | | | | Merge branch 'sg/describe-contains'Junio C Hamano2015-08-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | describe --contains: default to HEAD when no commit-ish is givenSZEDER Gábor2015-08-25
* | | | | | | | | | | | | | | Merge branch 'db/push-sign-if-asked'Junio C Hamano2015-08-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | push: add a config option push.gpgSign for default signed pushesDave Borowitz2015-08-19
| * | | | | | | | | | | | | | | push: support signing pushes iff the server supports itDave Borowitz2015-08-19
| * | | | | | | | | | | | | | | builtin/send-pack.c: use parse_options APIDave Borowitz2015-08-19
* | | | | | | | | | | | | | | | Merge branch 'jk/notes-merge-config'Junio C Hamano2015-08-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | notes: teach git-notes about notes.<name>.mergeStrategy optionJacob Keller2015-08-17