Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | | | | | | | | | | | | | | | | | | bisect: add 'git bisect terms' to view the current terms | Matthieu Moy | 2015-08-03 | |
| * | | | | | | | | | | | | | | | | | | | | | bisect: add the terms old/new | Antoine Delaite | 2015-08-03 | |
| * | | | | | | | | | | | | | | | | | | | | | bisect: sanity check on terms | Matthieu Moy | 2015-08-03 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/rerere' | Junio C Hamano | 2015-10-05 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | | rerere: un-nest merge() further | Junio C Hamano | 2015-07-24 | |
| * | | | | | | | | | | | | | | | | | | | | | | rerere: use "struct rerere_id" instead of "char *" for conflict ID | Junio C Hamano | 2015-07-24 | |
| * | | | | | | | | | | | | | | | | | | | | | | rerere: call conflict-ids IDs | Junio C Hamano | 2015-07-24 | |
| * | | | | | | | | | | | | | | | | | | | | | | rerere: further clarify do_rerere_one_path() | Junio C Hamano | 2015-07-24 | |
| * | | | | | | | | | | | | | | | | | | | | | | rerere: further de-dent do_plain_rerere() | Junio C Hamano | 2015-07-24 | |
| * | | | | | | | | | | | | | | | | | | | | | | rerere: refactor "replay" part of do_plain_rerere() | Junio C Hamano | 2015-07-24 | |
| * | | | | | | | | | | | | | | | | | | | | | | rerere: explain the remainder | Junio C Hamano | 2015-07-24 | |
| * | | | | | | | | | | | | | | | | | | | | | | rerere: explain "rerere forget" codepath | Junio C Hamano | 2015-07-24 | |
| * | | | | | | | | | | | | | | | | | | | | | | rerere: explain the primary codepath | Junio C Hamano | 2015-07-24 | |
| * | | | | | | | | | | | | | | | | | | | | | | rerere: explain MERGE_RR management helpers | Junio C Hamano | 2015-07-24 | |
| * | | | | | | | | | | | | | | | | | | | | | | rerere: fix benign off-by-one non-bug and clarify code | Junio C Hamano | 2015-07-24 | |
| * | | | | | | | | | | | | | | | | | | | | | | rerere: explain the rerere I/O abstraction | Junio C Hamano | 2015-07-24 | |
| * | | | | | | | | | | | | | | | | | | | | | | rerere: do not leak mmfile[] for a path with multiple stage #1 entries | Junio C Hamano | 2015-07-24 | |
| * | | | | | | | | | | | | | | | | | | | | | | rerere: stop looping unnecessarily | Junio C Hamano | 2015-07-24 | |
| * | | | | | | | | | | | | | | | | | | | | | | rerere: drop want_sp parameter from is_cmarker() | Junio C Hamano | 2015-07-24 | |
| * | | | | | | | | | | | | | | | | | | | | | | rerere: report autoupdated paths only after actually updating them | Junio C Hamano | 2015-07-24 | |
| * | | | | | | | | | | | | | | | | | | | | | | rerere: write out each record of MERGE_RR in one go | Junio C Hamano | 2015-07-24 | |
| * | | | | | | | | | | | | | | | | | | | | | | rerere: lift PATH_MAX limitation | Junio C Hamano | 2015-07-24 | |
| * | | | | | | | | | | | | | | | | | | | | | | rerere: plug conflict ID leaks | Junio C Hamano | 2015-07-24 | |
| * | | | | | | | | | | | | | | | | | | | | | | rerere: handle conflicts with multiple stage #1 entries | Junio C Hamano | 2015-07-24 | |
| * | | | | | | | | | | | | | | | | | | | | | | rerere: fix an off-by-one non-bug | Junio C Hamano | 2015-06-28 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kn/for-each-tag-branch' | Junio C Hamano | 2015-10-05 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | | | | for-each-ref: add '--contains' option | Karthik Nayak | 2015-08-03 | |
| * | | | | | | | | | | | | | | | | | | | | | ref-filter: implement '--contains' option | Karthik Nayak | 2015-08-03 | |
| * | | | | | | | | | | | | | | | | | | | | | parse-options.h: add macros for '--contains' option | Karthik Nayak | 2015-08-03 | |
| * | | | | | | | | | | | | | | | | | | | | | parse-option: rename parse_opt_with_commit() | Karthik Nayak | 2015-08-03 | |
| * | | | | | | | | | | | | | | | | | | | | | for-each-ref: add '--merged' and '--no-merged' options | Karthik Nayak | 2015-08-03 | |
| * | | | | | | | | | | | | | | | | | | | | | ref-filter: implement '--merged' and '--no-merged' options | Karthik Nayak | 2015-08-03 | |
| * | | | | | | | | | | | | | | | | | | | | | ref-filter: add parse_opt_merge_filter() | Karthik Nayak | 2015-08-03 | |
| * | | | | | | | | | | | | | | | | | | | | | for-each-ref: add '--points-at' option | Karthik Nayak | 2015-08-03 | |
| * | | | | | | | | | | | | | | | | | | | | | ref-filter: implement '--points-at' option | Karthik Nayak | 2015-08-03 | |
| * | | | | | | | | | | | | | | | | | | | | | tag: libify parse_opt_points_at() | Karthik Nayak | 2015-08-03 | |
| * | | | | | | | | | | | | | | | | | | | | | t6302: for-each-ref tests for ref-filter APIs | Karthik Nayak | 2015-08-03 | |
* | | | | | | | | | | | | | | | | | | | | | | Git 2.6v2.6.0 | Junio C Hamano | 2015-09-28 | |
* | | | | | | | | | | | | | | | | | | | | | | Git 2.6-rc3v2.6.0-rc3 | Junio C Hamano | 2015-09-21 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rj/mailmap-ramsay' | Junio C Hamano | 2015-09-21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | | mailmap: update my entry with new email address | Ramsay Jones | 2015-09-16 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bn/send-email-smtp-auth-error-message-fix' | Junio C Hamano | 2015-09-21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | send-email: fix uninitialized var warning for $smtp_auth | Brian Norris | 2015-09-21 | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'l10n-2.6.0-rnd2+de' of git://github.com/git-l10n/git-po | Junio C Hamano | 2015-09-21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | l10n: de.po: better language for one string | Phillip Sz | 2015-09-20 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | l10n: de.po: translate 2 messages | Ralf Thielow | 2015-09-20 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | l10n: Update and review Vietnamese translation (2440t) | Tran Ngoc Quan | 2015-09-21 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | l10n: fr.po v2.6.0 round 2 (2440t) | Jean-Noel Avila | 2015-09-21 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | l10n: zh_CN: for git v2.6.0 l10n round 2 | Jiang Xin | 2015-09-21 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | l10n: ca.po: update translation | Alex Henrie | 2015-09-21 |