Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
rerere.c
Age
Commit message (
Expand
)
Author
2010-01-21
Merge branch 'jc/conflict-marker-size'
Junio C Hamano
2010-01-21
Merge branch 'jc/cache-unmerge'
Junio C Hamano
2010-01-17
rerere: honor conflict-marker-size attribute
Junio C Hamano
2010-01-17
rerere: prepare for customizable conflict marker length
Junio C Hamano
2010-01-17
rerere: use ll_merge() instead of using xdl_merge()
Junio C Hamano
2010-01-17
xdl_merge(): introduce xmparam_t for merge specific parameters
Junio C Hamano
2010-01-11
rerere forget path: forget recorded resolution
Junio C Hamano
2010-01-11
rerere: refactor rerere logic to make it independent from I/O
Junio C Hamano
2009-12-26
rerere: remove silly 1024-byte line limit
Junio C Hamano
2009-12-04
Teach --[no-]rerere-autoupdate option to merge, revert and friends
Junio C Hamano
2009-09-13
use write_str_in_full helper to avoid literal string lengths
Jim Meyering
2009-04-30
replace direct calls to unlink(2) with unlink_or_warn
Alex Riesen
2009-02-15
rerere: remove duplicated functions
SZEDER Gábor
2009-02-11
Drop double-semicolon in C
Junio C Hamano
2008-12-05
Make some of fwrite/fclose/write/close failures visible
Alex Riesen
2008-10-31
Merge branch 'ar/maint-mksnpath' into ar/mksnpath
Junio C Hamano
2008-10-31
Use git_pathdup instead of xstrdup(git_path(...))
Alex Riesen
2008-10-22
Merge branch 'jc/maint-co-track'
Junio C Hamano
2008-10-19
Enhance hold_lock_file_for_{update,append}() API
Junio C Hamano
2008-10-12
Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer
Brandon Casey
2008-10-03
fix openssl headers conflicting with custom SHA1 implementations
Nicolas Pitre
2008-09-29
Merge branch 'jc/better-conflict-resolution'
Shawn O. Pearce
2008-09-09
is_directory(): a generic helper function
Junio C Hamano
2008-08-31
rerere: understand "diff3 -m" style conflicts with the original
Junio C Hamano
2008-08-31
rerere.c: use symbolic constants to keep track of parsing states
Junio C Hamano
2008-07-22
Rename path_list to string_list
Johannes Schindelin
2008-07-17
rerere.autoupdate: change the message when autoupdate is in effect
Junio C Hamano
2008-07-15
Merge branch 'js/merge-rr'
Junio C Hamano
2008-07-10
rerere: Separate libgit and builtin functions
Stephan Beyer