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