- eea0e59 treewide: remove unnecessary includes in source files by Elijah Newren · 1 year, 1 month ago
- da9502f treewide: remove unnecessary includes for wrapper.h by Calvin Wan · 1 year, 6 months ago
- bc5c5ec cache.h: remove this no-longer-used header by Elijah Newren · 1 year, 8 months ago
- d1cbe1e hash-ll.h: split out of hash.h to remove dependency on repository.h by Elijah Newren · 1 year, 9 months ago
- d5ebb50 wrapper.h: move declarations for wrapper.c functions from cache.h by Elijah Newren · 1 year, 10 months ago
- f394e09 treewide: be explicit about dependence on gettext.h by Elijah Newren · 1 year, 10 months ago
- 61bdc7c diff: mark unused parameters in callbacks by Jeff King · 2 years, 1 month ago
- d775618 doc txt & -h consistency: make "rerere" consistent by Ævar Arnfjörð Bjarmason · 2 years, 3 months ago
- f6a8ef0 doc txt & -h consistency: fix mismatching labels by Ævar Arnfjörð Bjarmason · 2 years, 3 months ago
- 22233d4 xdiff users: use designated initializers for out_line by Ævar Arnfjörð Bjarmason · 3 years, 9 months ago
- cde5554 Merge branch 'nd/the-index' by Junio C Hamano · 6 years ago
- 39d23df Merge branch 'jk/xdiff-interface' by Junio C Hamano · 6 years ago
- 55e6b35 rerere.c: remove the_repository references by Nguyễn Thái Ngọc Duy · 6 years ago
- 611e42a xdiff: provide a separate emit callback for hunks by Jeff King · 6 years ago
- 11877b9 Merge branch 'nd/the-index' by Junio C Hamano · 6 years ago
- 35843b1 rerere.c: remove implicit dependency on the_index by Nguyễn Thái Ngọc Duy · 6 years ago
- 2373b65 rerere: mark strings for translation by Thomas Gummerer · 6 years ago
- 28fc9ab rerere: wrap paths in output in sq by Thomas Gummerer · 6 years ago
- 06f46f2 avoid "write_in_full(fd, buf, len) != len" pattern by Jeff King · 7 years ago
- b2141fc config: don't include config.h by default by Brandon Williams · 8 years ago
- 590f6e4 Sync with 2.6.1 by Junio C Hamano · 9 years ago
- dc5400e Merge branch 'jc/rerere' by Junio C Hamano · 9 years ago
- 3adc4ec Sync with v2.5.4 by Junio C Hamano · 9 years ago
- 6343e2f Sync with 2.3.10 by Junio C Hamano · 9 years ago
- 3efb988 react to errors in xdi_diff by Jeff King · 9 years ago
- 9dd330e rerere: release lockfile in non-writing functions by Jeff King · 9 years ago
- 1d51ece rerere: use "struct rerere_id" instead of "char *" for conflict ID by Junio C Hamano · 10 years ago
- 18bb993 rerere: call conflict-ids IDs by Junio C Hamano · 10 years ago
- 9c9b4f2 standardize usage info string format by Alex Henrie · 10 years ago
- de3d8bb rerere: fix for merge.conflictstyle by Felipe Contreras · 11 years ago
- 01a10b0 rerere: convert to use parse_pathspec by Nguyễn Thái Ngọc Duy · 11 years ago
- 0ff07f2 i18n: rerere: mark parseopt strings for translation by Nguyễn Thái Ngọc Duy · 12 years ago
- 0f891e7 rerere: libify rerere_clear() and rerere_gc() by Junio C Hamano · 14 years ago
- 5d2c3b0 rerere forget: deprecate invocation without pathspec by Johannes Sixt · 14 years ago
- ac49f5c rerere "remaining" by Martin von Zweigbergk · 14 years ago
- 8aed4a5 Merge branch 'jn/merge-renormalize' by Junio C Hamano · 14 years ago
- e24058f Merge branch 'sg/rerere-gc-old-still-used' by Junio C Hamano · 14 years ago
- 6b5005c Merge branch 'tf/string-list-init' by Junio C Hamano · 14 years ago
- 672d1b7 rerere: migrate to parse-options API by Jonathan Nieder · 14 years ago
- 4bd874c Merge branch 'js/merge-rr-fix' by Junio C Hamano · 14 years ago
- 3ca399d MERGE_RR is in .git, not .git/rr-cache by Jay Soffian · 14 years ago
- 7d7ff15 rerere: fix overeager gc by SZEDER Gábor · 15 years ago
- 183113a string_list: Add STRING_LIST_INIT macro and make use of it. by Thiago Farina · 15 years ago
- a53deac Merge branch 'jp/string-list-api-cleanup' by Junio C Hamano · 15 years ago
- 1d2f80f string_list: Fix argument order for string_list_append by Julian Phillips · 15 years ago
- 6033553 Merge branch 'rs/diff-no-minimal' into maint by Junio C Hamano · 15 years ago
- 39b5977 Merge branch 'rs/diff-no-minimal' by Junio C Hamano · 15 years ago
- 81b50f3 Move 'builtin-*' into a 'builtin/' subdirectory by Linus Torvalds · 15 years ago[Renamed from builtin-rerere.c]
- 5a9f039 Make 'rerere forget' work from a subdirectory. by Johannes Sixt · 15 years ago
- 6751e04 Merge branch 'jc/cache-unmerge' by Junio C Hamano · 15 years ago
- 4a88fb7 Merge branch 'jc/rerere' by Junio C Hamano · 15 years ago
- dea4562 rerere forget path: forget recorded resolution by Junio C Hamano · 15 years ago
- 3880c18 Sync with 1.6.5.5 by Junio C Hamano · 15 years ago
- e5f5917 rerere: don't segfault on failure to open rr-cache by Jeff King · 15 years ago
- cb6020b Teach --[no-]rerere-autoupdate option to merge, revert and friends by Junio C Hamano · 15 years ago
- 99caeed Let 'git <command> -h' show usage without a git dir by Jonathan Nieder · 15 years ago
- 691f1a2 replace direct calls to unlink(2) with unlink_or_warn by Alex Riesen · 16 years ago
- 9005696 rerere: remove duplicated functions by SZEDER Gábor · 16 years ago
- 8ca12c0 add is_dot_or_dotdot inline function by Alexander Potashev · 16 years ago
- 9ccd0a8 Always initialize xpparam_t to 0 by Brian Downing · 16 years ago
- c455c87 Rename path_list to string_list by Johannes Schindelin · 16 years ago
- 588c038 Merge branch 'sb/dashless' by Junio C Hamano · 16 years ago
- 1b1dd23 Make usage strings dash-less by Stephan Beyer · 17 years ago
- 5b2fd95 rerere: Separate libgit and builtin functions by Stephan Beyer · 17 years ago
- 99d698f builtin-rerere: more carefully find conflict markers by Olivier Marin · 17 years ago
- 121c813 rerere.autoupdate by Junio C Hamano · 17 years ago
- 51e0d0a rerere: remove dubious "tail_optimization" by Junio C Hamano · 17 years ago
- a1b32fd git-rerere: detect unparsable conflicts by Junio C Hamano · 17 years ago
- 9022a49 rerere: rerere_created_at() and has_resolution() abstraction by Junio C Hamano · 17 years ago
- 1a8fb15 builtin-rerere: fix a small leak by Junio C Hamano · 17 years ago
- ef90d6d Provide git_config with a callback-data parameter by Johannes Schindelin · 17 years ago
- 2db511f Merge branch 'maint' by Junio C Hamano · 17 years ago
- 1468bd4 Use a single implementation and API for copy_file() by Daniel Barkalow · 17 years ago
- 7a51ed6 Make on-disk index representation separate from in-core one by Linus Torvalds · 17 years ago
- 4ed7cd3 Improve use of lockfile API by Brandon Casey · 17 years ago
- c279d7e xdl_diff: identify call sites. by Junio C Hamano · 17 years ago
- d8b7db0 Export rerere() and launch_editor(). by Kristian Høgsberg · 17 years ago
- b4833a2 rerere: Fix use of an empty strbuf.buf by Junio C Hamano · 17 years ago
- 8289b62 Make builtin-rerere use of strbuf nicer and more efficient. by Pierre Habouzit · 17 years ago
- ba3ed09 Now that cache.h needs strbuf.h, remove useless includes. by Pierre Habouzit · 17 years ago
- f1696ee Strbuf API extensions and fixes. by Pierre Habouzit · 17 years ago
- 19b358e Use strbuf API in buitin-rerere.c by Pierre Habouzit · 17 years ago
- baffc0e Make every builtin-*.c file #include "builtin.h" by Peter Hagervall · 18 years ago
- 52aaf64 rerere: record resolution even if file is not in merge base by Johannes Schindelin · 18 years ago
- e3c76db Merge branch 'jc/diff-mark' by Junio C Hamano · 18 years ago
- b4372ef Enable "git rerere" by the config variable rerere.enabled by Johannes Schindelin · 18 years ago
- 30b2501 Future-proof source for changes in xdemitconf_t by Johannes Schindelin · 18 years ago
- 91c8d59 detect close failure on just-written file handles by Jim Meyering · 18 years ago
- a6080a0 War on whitespace by Junio C Hamano · 18 years ago
- 2b93edb rerere: make sorting really stable. by Junio C Hamano · 18 years ago
- 045f575 Merge 1.5.0.7 in by Junio C Hamano · 18 years ago
- eb33596 rerere should not repeat the earlier hunks in later ones by Junio C Hamano · 18 years ago
- 2c7ca1f Merge branch 'maint' by Junio C Hamano · 18 years ago
- 1289172 rerere: do not deal with symlinks. by Junio C Hamano · 18 years ago
- ab242f8 rerere: do not skip two conflicted paths next to each other. by Junio C Hamano · 18 years ago
- 599065a prefixcmp(): fix-up mechanical conversion. by Junio C Hamano · 18 years ago
- cc44c76 Mechanical conversion to use prefixcmp() by Junio C Hamano · 18 years ago
- 93822c2 short i/o: fix calls to write to use xwrite or write_in_full by Andy Whitcroft · 18 years ago
- 3a2d3e8 rerere: Fix removal of already resolved path. by Junio C Hamano · 18 years ago
- 48c3242 rerere gc: honor configuration and document it by Junio C Hamano · 18 years ago