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
/
t
/
t6026-merge-attr.sh
Commit message (
Expand
)
Author
Age
*
t6026: clarify the point of "kill $(cat sleep.pid)"
Johannes Sixt
2016-11-11
*
t6026: ensure that long-running script really is
Johannes Schindelin
2016-11-10
*
Revert "t6026-merge-attr: don't fail if sleep exits early"
Junio C Hamano
2016-11-10
*
Revert "t6026-merge-attr: ensure that the merge driver was called"
Junio C Hamano
2016-11-10
*
t6026-merge-attr: ensure that the merge driver was called
Andreas Schwab
2016-11-10
*
t6026-merge-attr: don't fail if sleep exits early
Andreas Schwab
2016-11-08
*
t6026-merge-attr: clean up background process at end of test case
Johannes Sixt
2016-09-07
*
mingw: ensure temporary file handles are not inherited by child processes
Ben Wijen
2016-08-23
*
t6026-merge-attr: child processes must not inherit index.lock handles
Ben Wijen
2016-08-18
*
merge: refuse to create too cool a merge by default
Junio C Hamano
2016-03-23
*
Merge branch 'jc/ll-merge-expose-path'
Junio C Hamano
2015-06-24
|
\
|
*
ll-merge: pass the original path to external drivers
Junio C Hamano
2015-06-04
*
|
t: fix some trivial cases of ignored exit codes in loops
Jeff King
2015-03-25
|
/
*
conflict-marker-size: add test and docs
Junio C Hamano
2010-01-20
*
Merge branch 'mv/merge-recursive'
Shawn O. Pearce
2008-09-25
|
\
|
*
builtin-merge: release the lockfile in try_merge_strategy()
Miklos Vajna
2008-09-06
*
|
tests: use "git xyzzy" form (t3600 - t6999)
Nanako Shiraishi
2008-09-03
|
/
*
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-18
*
Add a demonstration/test of customized merge.
Junio C Hamano
2007-04-17
