index
:
git
master
git
Fast-forward packages
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
builtin-rerere.c
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Rename path_list to string_list
Johannes Schindelin
2008-07-22
1
-10
/
+10
*
Merge branch 'sb/dashless'
Junio C Hamano
2008-07-17
1
-1
/
+1
|
\
|
*
Make usage strings dash-less
Stephan Beyer
2008-07-13
1
-1
/
+1
*
|
rerere: Separate libgit and builtin functions
Stephan Beyer
2008-07-10
1
-354
/
+18
*
|
builtin-rerere: more carefully find conflict markers
Olivier Marin
2008-07-10
1
-3
/
+13
|
/
*
rerere.autoupdate
Junio C Hamano
2008-06-22
1
-0
/
+37
*
rerere: remove dubious "tail_optimization"
Junio C Hamano
2008-06-22
1
-10
/
+9
*
git-rerere: detect unparsable conflicts
Junio C Hamano
2008-06-22
1
-0
/
+5
*
rerere: rerere_created_at() and has_resolution() abstraction
Junio C Hamano
2008-06-22
1
-31
/
+26
*
builtin-rerere: fix a small leak
Junio C Hamano
2008-06-18
1
-1
/
+1
*
Provide git_config with a callback-data parameter
Johannes Schindelin
2008-05-14
1
-3
/
+3
*
Merge branch 'maint'
Junio C Hamano
2008-02-26
1
-18
/
+1
|
\
|
*
Use a single implementation and API for copy_file()
Daniel Barkalow
2008-02-25
1
-18
/
+1
*
|
Make on-disk index representation separate from in-core one
Linus Torvalds
2008-01-21
1
-2
/
+2
|
/
*
Improve use of lockfile API
Brandon Casey
2008-01-17
1
-2
/
+2
*
xdl_diff: identify call sites.
Junio C Hamano
2007-12-14
1
-1
/
+1
*
Export rerere() and launch_editor().
Kristian Høgsberg
2007-09-27
1
-5
/
+26
*
rerere: Fix use of an empty strbuf.buf
Junio C Hamano
2007-09-27
1
-2
/
+4
*
Make builtin-rerere use of strbuf nicer and more efficient.
Pierre Habouzit
2007-09-26
1
-25
/
+18
*
Now that cache.h needs strbuf.h, remove useless includes.
Pierre Habouzit
2007-09-17
1
-1
/
+0
*
Strbuf API extensions and fixes.
Pierre Habouzit
2007-09-10
1
-2
/
+2
*
Use strbuf API in buitin-rerere.c
Pierre Habouzit
2007-09-07
1
-38
/
+18
*
Make every builtin-*.c file #include "builtin.h"
Peter Hagervall
2007-07-15
1
-0
/
+1
*
rerere: record resolution even if file is not in merge base
Johannes Schindelin
2007-07-10
1
-10
/
+7
*
Merge branch 'jc/diff-mark'
Junio C Hamano
2007-07-07
1
-1
/
+1
|
\
|
*
Future-proof source for changes in xdemitconf_t
Johannes Schindelin
2007-07-06
1
-1
/
+1
*
|
Enable "git rerere" by the config variable rerere.enabled
Johannes Schindelin
2007-07-07
1
-4
/
+28
|
/
*
detect close failure on just-written file handles
Jim Meyering
2007-06-27
1
-1
/
+2
*
War on whitespace
Junio C Hamano
2007-06-07
1
-1
/
+0
*
rerere: make sorting really stable.
Junio C Hamano
2007-04-04
1
-2
/
+5
*
Merge 1.5.0.7 in
Junio C Hamano
2007-04-04
1
-0
/
+9
|
\
|
*
rerere should not repeat the earlier hunks in later ones
Junio C Hamano
2007-04-04
1
-0
/
+9
*
|
Merge branch 'maint'
Junio C Hamano
2007-02-25
1
-6
/
+10
|
\
|
|
*
rerere: do not deal with symlinks.
Junio C Hamano
2007-02-25
1
-5
/
+9
|
*
rerere: do not skip two conflicted paths next to each other.
Junio C Hamano
2007-02-25
1
-1
/
+1
*
|
prefixcmp(): fix-up mechanical conversion.
Junio C Hamano
2007-02-21
1
-3
/
+3
*
|
Mechanical conversion to use prefixcmp()
Junio C Hamano
2007-02-21
1
-3
/
+3
|
/
*
short i/o: fix calls to write to use xwrite or write_in_full
Andy Whitcroft
2007-01-09
1
-4
/
+7
*
rerere: Fix removal of already resolved path.
Junio C Hamano
2007-01-05
1
-4
/
+3
*
rerere gc: honor configuration and document it
Junio C Hamano
2006-12-27
1
-0
/
+13
*
Make git-rerere a builtin
Johannes Schindelin
2006-12-22
1
-0
/
+406