index
:
git
main
maint
master
next
seen
todo
Git: sistema de control de versiones
mirror
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
t
/
t6026-merge-attr.sh
Age
Commit message (
Expand
)
Author
2016-08-23
mingw: ensure temporary file handles are not inherited by child processes
Ben Wijen
2016-08-18
t6026-merge-attr: child processes must not inherit index.lock handles
Ben Wijen
2016-03-23
merge: refuse to create too cool a merge by default
Junio C Hamano
2015-06-24
Merge branch 'jc/ll-merge-expose-path'
Junio C Hamano
2015-06-04
ll-merge: pass the original path to external drivers
Junio C Hamano
2015-03-25
t: fix some trivial cases of ignored exit codes in loops
Jeff King
2010-01-21
conflict-marker-size: add test and docs
Junio C Hamano
2008-09-25
Merge branch 'mv/merge-recursive'
Shawn O. Pearce
2008-09-07
builtin-merge: release the lockfile in try_merge_strategy()
Miklos Vajna
2008-09-03
tests: use "git xyzzy" form (t3600 - t6999)
Nanako Shiraishi
2007-04-18
Custom low-level merge driver: change the configuration scheme.
Junio C Hamano
2007-04-18
Custom low-level merge driver support.
Junio C Hamano
2007-04-17
Add a demonstration/test of customized merge.
Junio C Hamano