index
:
tgif.git
2.36
Terin's Improved Git Fork
terinjokes@gmail.com
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
builtin-rerere.c
Age
Commit message (
Expand
)
Author
Files
Lines
2010-01-21
Make 'rerere forget' work from a subdirectory.
Johannes Sixt
1
-2
/
+4
2010-01-20
Merge branch 'jc/cache-unmerge'
Junio C Hamano
1
-0
/
+3
2010-01-18
Merge branch 'jc/rerere'
Junio C Hamano
1
-7
/
+16
2010-01-10
rerere forget path: forget recorded resolution
Junio C Hamano
1
-0
/
+2
2009-12-05
Sync with 1.6.5.5
Junio C Hamano
1
-0
/
+2
2009-12-04
rerere: don't segfault on failure to open rr-cache
Jeff King
1
-0
/
+2
2009-12-04
Teach --[no-]rerere-autoupdate option to merge, revert and friends
Junio C Hamano
1
-7
/
+16
2009-11-10
Let 'git <command> -h' show usage without a git dir
Jonathan Nieder
1
-0
/
+3
2009-04-29
replace direct calls to unlink(2) with unlink_or_warn
Alex Riesen
1
-1
/
+1
2009-02-14
rerere: remove duplicated functions
SZEDER Gábor
1
-18
/
+7
2009-01-11
add is_dot_or_dotdot inline function
Alexander Potashev
1
-6
/
+5
2008-10-25
Always initialize xpparam_t to 0
Brian Downing
1
-0
/
+1
2008-07-21
Rename path_list to string_list
Johannes Schindelin
1
-10
/
+10
2008-07-16
Merge branch 'sb/dashless'
Junio C Hamano
1
-1
/
+1
2008-07-13
Make usage strings dash-less
Stephan Beyer
1
-1
/
+1
2008-07-10
rerere: Separate libgit and builtin functions
Stephan Beyer
1
-354
/
+18
2008-07-10
builtin-rerere: more carefully find conflict markers
Olivier Marin
1
-3
/
+13
2008-06-22
rerere.autoupdate
Junio C Hamano
1
-0
/
+37
2008-06-22
rerere: remove dubious "tail_optimization"
Junio C Hamano
1
-10
/
+9
2008-06-22
git-rerere: detect unparsable conflicts
Junio C Hamano
1
-0
/
+5
2008-06-22
rerere: rerere_created_at() and has_resolution() abstraction
Junio C Hamano
1
-31
/
+26
2008-06-17
builtin-rerere: fix a small leak
Junio C Hamano
1
-1
/
+1
2008-05-14
Provide git_config with a callback-data parameter
Johannes Schindelin
1
-3
/
+3
2008-02-26
Merge branch 'maint'
Junio C Hamano
1
-18
/
+1
2008-02-25
Use a single implementation and API for copy_file()
Daniel Barkalow
1
-18
/
+1
2008-01-21
Make on-disk index representation separate from in-core one
Linus Torvalds
1
-2
/
+2
2008-01-16
Improve use of lockfile API
Brandon Casey
1
-2
/
+2
2007-12-13
xdl_diff: identify call sites.
Junio C Hamano
1
-1
/
+1
2007-09-27
Export rerere() and launch_editor().
Kristian Høgsberg
1
-5
/
+26
2007-09-26
rerere: Fix use of an empty strbuf.buf
Junio C Hamano
1
-2
/
+4
2007-09-26
Make builtin-rerere use of strbuf nicer and more efficient.
Pierre Habouzit
1
-25
/
+18
2007-09-16
Now that cache.h needs strbuf.h, remove useless includes.
Pierre Habouzit
1
-1
/
+0
2007-09-10
Strbuf API extensions and fixes.
Pierre Habouzit
1
-2
/
+2
2007-09-06
Use strbuf API in buitin-rerere.c
Pierre Habouzit
1
-38
/
+18
2007-07-14
Make every builtin-*.c file #include "builtin.h"
Peter Hagervall
1
-0
/
+1
2007-07-09
rerere: record resolution even if file is not in merge base
Johannes Schindelin
1
-10
/
+7
2007-07-07
Merge branch 'jc/diff-mark'
Junio C Hamano
1
-1
/
+1
2007-07-06
Enable "git rerere" by the config variable rerere.enabled
Johannes Schindelin
1
-4
/
+28
2007-07-06
Future-proof source for changes in xdemitconf_t
Johannes Schindelin
1
-1
/
+1
2007-06-26
detect close failure on just-written file handles
Jim Meyering
1
-1
/
+2
2007-06-07
War on whitespace
Junio C Hamano
1
-1
/
+0
2007-04-04
rerere: make sorting really stable.
Junio C Hamano
1
-2
/
+5
2007-04-03
Merge 1.5.0.7 in
Junio C Hamano
1
-0
/
+9
2007-04-03
rerere should not repeat the earlier hunks in later ones
Junio C Hamano
1
-0
/
+9
2007-02-25
Merge branch 'maint'
Junio C Hamano
1
-6
/
+10
2007-02-25
rerere: do not deal with symlinks.
Junio C Hamano
1
-5
/
+9
2007-02-25
rerere: do not skip two conflicted paths next to each other.
Junio C Hamano
1
-1
/
+1
2007-02-20
prefixcmp(): fix-up mechanical conversion.
Junio C Hamano
1
-3
/
+3
2007-02-20
Mechanical conversion to use prefixcmp()
Junio C Hamano
1
-3
/
+3
2007-01-08
short i/o: fix calls to write to use xwrite or write_in_full
Andy Whitcroft
1
-4
/
+7
[next]