aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | | | | | | | | | | bisect: add 'git bisect terms' to view the current termsMatthieu Moy2015-08-03
| * | | | | | | | | | | | | | | | | | | | | bisect: add the terms old/newAntoine Delaite2015-08-03
| * | | | | | | | | | | | | | | | | | | | | bisect: sanity check on termsMatthieu Moy2015-08-03
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/rerere'Junio C Hamano2015-10-05
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | rerere: un-nest merge() furtherJunio C Hamano2015-07-24
| * | | | | | | | | | | | | | | | | | | | | | rerere: use "struct rerere_id" instead of "char *" for conflict IDJunio C Hamano2015-07-24
| * | | | | | | | | | | | | | | | | | | | | | rerere: call conflict-ids IDsJunio C Hamano2015-07-24
| * | | | | | | | | | | | | | | | | | | | | | rerere: further clarify do_rerere_one_path()Junio C Hamano2015-07-24
| * | | | | | | | | | | | | | | | | | | | | | rerere: further de-dent do_plain_rerere()Junio C Hamano2015-07-24
| * | | | | | | | | | | | | | | | | | | | | | rerere: refactor "replay" part of do_plain_rerere()Junio C Hamano2015-07-24
| * | | | | | | | | | | | | | | | | | | | | | rerere: explain the remainderJunio C Hamano2015-07-24
| * | | | | | | | | | | | | | | | | | | | | | rerere: explain "rerere forget" codepathJunio C Hamano2015-07-24
| * | | | | | | | | | | | | | | | | | | | | | rerere: explain the primary codepathJunio C Hamano2015-07-24
| * | | | | | | | | | | | | | | | | | | | | | rerere: explain MERGE_RR management helpersJunio C Hamano2015-07-24
| * | | | | | | | | | | | | | | | | | | | | | rerere: fix benign off-by-one non-bug and clarify codeJunio C Hamano2015-07-24
| * | | | | | | | | | | | | | | | | | | | | | rerere: explain the rerere I/O abstractionJunio C Hamano2015-07-24
| * | | | | | | | | | | | | | | | | | | | | | rerere: do not leak mmfile[] for a path with multiple stage #1 entriesJunio C Hamano2015-07-24
| * | | | | | | | | | | | | | | | | | | | | | rerere: stop looping unnecessarilyJunio C Hamano2015-07-24
| * | | | | | | | | | | | | | | | | | | | | | rerere: drop want_sp parameter from is_cmarker()Junio C Hamano2015-07-24
| * | | | | | | | | | | | | | | | | | | | | | rerere: report autoupdated paths only after actually updating themJunio C Hamano2015-07-24
| * | | | | | | | | | | | | | | | | | | | | | rerere: write out each record of MERGE_RR in one goJunio C Hamano2015-07-24
| * | | | | | | | | | | | | | | | | | | | | | rerere: lift PATH_MAX limitationJunio C Hamano2015-07-24
| * | | | | | | | | | | | | | | | | | | | | | rerere: plug conflict ID leaksJunio C Hamano2015-07-24
| * | | | | | | | | | | | | | | | | | | | | | rerere: handle conflicts with multiple stage #1 entriesJunio C Hamano2015-07-24
| * | | | | | | | | | | | | | | | | | | | | | rerere: fix an off-by-one non-bugJunio C Hamano2015-06-28
* | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | | | | | t6302: for-each-ref tests for ref-filter APIsKarthik Nayak2015-08-03
* | | | | | | | | | | | | | | | | | | | | | Git 2.6v2.6.0Junio C Hamano2015-09-28
* | | | | | | | | | | | | | | | | | | | | | Git 2.6-rc3v2.6.0-rc3Junio C Hamano2015-09-21
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'rj/mailmap-ramsay'Junio C Hamano2015-09-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | mailmap: update my entry with new email addressRamsay Jones2015-09-16
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bn/send-email-smtp-auth-error-message-fix'Junio C Hamano2015-09-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | send-email: fix uninitialized var warning for $smtp_authBrian Norris2015-09-21
* | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'l10n-2.6.0-rnd2+de' of git://github.com/git-l10n/git-poJunio C Hamano2015-09-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | l10n: de.po: better language for one stringPhillip Sz2015-09-20
| * | | | | | | | | | | | | | | | | | | | | | | | l10n: de.po: translate 2 messagesRalf Thielow2015-09-20
| * | | | | | | | | | | | | | | | | | | | | | | | l10n: Update and review Vietnamese translation (2440t)Tran Ngoc Quan2015-09-21
| * | | | | | | | | | | | | | | | | | | | | | | | l10n: fr.po v2.6.0 round 2 (2440t)Jean-Noel Avila2015-09-21
| * | | | | | | | | | | | | | | | | | | | | | | | l10n: zh_CN: for git v2.6.0 l10n round 2Jiang Xin2015-09-21
| * | | | | | | | | | | | | | | | | | | | | | | | l10n: ca.po: update translationAlex Henrie2015-09-21