| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | xdiff users: use designated initializers for out_line | Ævar Arnfjörð Bjarmason | 2021-05-11 | 1 | -3/+1 |
| * | Merge branch 'nd/the-index' | Junio C Hamano | 2019-01-04 | 1 | -4/+6 |
| |\ | |||||
| | * | rerere.c: remove the_repository references | Nguyễn Thái Ngọc Duy | 2018-11-12 | 1 | -4/+6 |
| * | | Merge branch 'jk/xdiff-interface' | Junio C Hamano | 2018-11-13 | 1 | -1/+2 |
| |\ \ | |/ |/| | |||||
| | * | xdiff: provide a separate emit callback for hunks | Jeff King | 2018-11-02 | 1 | -1/+2 |
| * | | Merge branch 'nd/the-index' | Junio C Hamano | 2018-10-19 | 1 | -3/+3 |
| |\ \ | |||||
| | * | | rerere.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-09-21 | 1 | -3/+3 |
| | |/ | |||||
| * | | rerere: mark strings for translation | Thomas Gummerer | 2018-08-06 | 1 | -2/+2 |
| * | | rerere: wrap paths in output in sq | Thomas Gummerer | 2018-07-16 | 1 | -1/+1 |
| |/ | |||||
| * | avoid "write_in_full(fd, buf, len) != len" pattern | Jeff King | 2017-09-14 | 1 | -1/+1 |
| * | config: don't include config.h by default | Brandon Williams | 2017-06-15 | 1 | -0/+1 |
| * | Sync with 2.6.1 | Junio C Hamano | 2015-10-05 | 1 | -4/+6 |
| |\ | |||||
| | * | Sync with v2.5.4 | Junio C Hamano | 2015-09-28 | 1 | -4/+6 |
| | |\ | |||||
| | | * | Sync with 2.3.10 | Junio C Hamano | 2015-09-28 | 1 | -4/+6 |
| | | |\ | |||||
| | | | * | react to errors in xdi_diff | Jeff King | 2015-09-28 | 1 | -4/+6 |
| * | | | | Merge branch 'jc/rerere' | Junio C Hamano | 2015-10-05 | 1 | -2/+2 |
| |\ \ \ \ | |/ / / |/| | | | |||||
| | * | | | rerere: use "struct rerere_id" instead of "char *" for conflict ID | Junio C Hamano | 2015-07-24 | 1 | -1/+1 |
| | * | | | rerere: call conflict-ids IDs | Junio C Hamano | 2015-07-24 | 1 | -2/+2 |
| | | |/ | |/| | |||||
| * | | | rerere: release lockfile in non-writing functionsjk/am-rerere-lock-fix | Jeff King | 2015-09-01 | 1 | -9/+9 |
| | |/ |/| | |||||
| * | | standardize usage info string format | Alex Henrie | 2015-01-14 | 1 | -1/+1 |
| |/ | |||||
| * | rerere: fix for merge.conflictstylefc/rerere-conflict-style | Felipe Contreras | 2014-04-30 | 1 | -0/+2 |
| * | rerere: convert to use parse_pathspec | Nguyễn Thái Ngọc Duy | 2013-07-15 | 1 | -3/+5 |
| * | i18n: rerere: mark parseopt strings for translation | Nguyễn Thái Ngọc Duy | 2012-08-20 | 1 | -2/+2 |
| * | rerere: libify rerere_clear() and rerere_gc() | Junio C Hamano | 2011-05-08 | 1 | -75/+2 |
| * | rerere forget: deprecate invocation without pathspec | Johannes Sixt | 2011-03-02 | 1 | -2/+5 |
| * | rerere "remaining" | Martin von Zweigbergk | 2011-02-16 | 1 | -2/+12 |
| * | Merge branch 'jn/merge-renormalize' | Junio C Hamano | 2010-09-03 | 1 | -24/+28 |
| |\ | |||||
| | * | rerere: migrate to parse-options API | Jonathan Nieder | 2010-08-06 | 1 | -24/+28 |
| * | | Merge branch 'sg/rerere-gc-old-still-used' | Junio C Hamano | 2010-08-31 | 1 | -5/+16 |
| |\ \ | |||||
| | * | | rerere: fix overeager gc | SZEDER Gábor | 2010-07-14 | 1 | -5/+16 |
| * | | | Merge branch 'tf/string-list-init' | Junio C Hamano | 2010-08-18 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | string_list: Add STRING_LIST_INIT macro and make use of it. | Thiago Farina | 2010-07-05 | 1 | -2/+2 |
| * | | | | Merge branch 'js/merge-rr-fix' | Junio C Hamano | 2010-07-15 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / |/| | | | |||||
| | * | | | MERGE_RR is in .git, not .git/rr-cache | Jay Soffian | 2010-07-14 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | Merge branch 'rs/diff-no-minimal' into maint | Junio C Hamano | 2010-06-21 | 1 | -1/+1 |
| * | | | Merge branch 'jp/string-list-api-cleanup' | Junio C Hamano | 2010-06-30 | 1 | -1/+1 |
| |\ \ \ | |_|/ |/| | | |||||
| | * | | string_list: Fix argument order for string_list_append | Julian Phillips | 2010-06-27 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge branch 'rs/diff-no-minimal' | Junio C Hamano | 2010-06-13 | 1 | -1/+1 |
| |/ | |||||
| * | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 2010-02-22 | 1 | -0/+155 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |