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
/
ll-merge.c
Age
Commit message (
Expand
)
Author
Files
Lines
2009-07-06
Merge branch 'tr/die_errno'
Junio C Hamano
1
-1
/
+1
2009-07-05
run_command: return exit code as positive value
Johannes Sixt
1
-4
/
+0
2009-07-01
Remove filename from conflict markers
Martin Renold
1
-4
/
+4
2009-06-27
Use die_errno() instead of die() when checking syscalls
Thomas Rast
1
-1
/
+1
2009-06-20
Merge branch 'sb/maint-1.6.0-add-config-fix'
Junio C Hamano
1
-4
/
+4
2009-06-14
use xstrdup, not strdup in ll-merge.c
Jim Meyering
1
-4
/
+4
2009-06-09
Simplify some instances of run_command() by using run_command_v_opt().
Johannes Sixt
1
-9
/
+2
2009-04-29
replace direct calls to unlink(2) with unlink_or_warn
Alex Riesen
1
-1
/
+1
2008-11-23
merge-recursive: use strbuf_expand() instead of interpolate()
René Scharfe
1
-12
/
+9
2008-08-30
git-merge-recursive: learn to honor merge.conflictstyle
Junio C Hamano
1
-5
/
+13
2008-05-14
Provide git_config with a callback-data parameter
Johannes Schindelin
1
-2
/
+2
2008-02-18
merge-recursive: split low-level merge functions out.
Junio C Hamano
1
-0
/
+379
[prev]