repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
tests: don't rely on strerror text when testing rmdir failure
2014-03-31
Charl
e
s B
a
i
l
ey
tests: don't
r
e
ly on s
t
rerror text
when test
i
ng rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Ch
a
rles Bailey
dir
.
c: make git_fnm
a
tch() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bai
l
ey
m
erg
e
tool
:
Remove explicit r
e
fe
r
ences
to /
d
ev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Bailey
sta
s
h tests:
s
tash
c
an lose
data in a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charl
e
s Bailey
sta
s
h: Don't overwrite
f
i
les that have gone
f
r
o
m the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bail
e
y
D
o
cumentati
o
n: Describe
o
ther s
i
tuations where -z af
f
ec
t
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charle
s
Ba
i
l
e
y
Change
x
d
l
_merge
t
o
g
e
nerate output even for nul
l
m
e
rges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bail
e
y
t6023: merg
e
-file fails to
o
u
tput anything for a de
g
en
e
rate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bai
l
ey
m
e
r
g
etool:
fix
r
unning
m
ergetool in sub-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
merget
o
ol: Add
a
test fo
r
running
mergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bail
e
y
mergetool: re
s
pect a
u
tocrlf b
y
usin
g
checkout-ind
e
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
merget
o
o
l
: Don't
keep temp
o
rary merge
f
iles u
n
less
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles
B
ailey
mergetool: Add prompt
t
o continu
e
after fai
l
in
g
to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arles Bailey
Add -
y
/--no-p
r
ompt option
to
mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fix some
t
ab/s
p
ace incon
s
istencies in g
i
t-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Cha
r
les Bail
e
y
git-arch
i
v
e
: wor
k
in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
r
l
es Bailey
M
ake git archiv
e
respec
t
core
.
a
u
to
c
rlf when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
rles Bailey
Add new test
t
o
d
emonstra
t
e
git archive core
.
autoc
r
l
f
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
merge-tool docume
n
tation: descri
b
e custom c
o
mman
d
usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rles Bailey
g
i
t-mergetool docu
m
entaiton: show tooln
a
m
e
s in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Baile
y
Add a
very basic test
script
for git merget
o
ol
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
l
e
s
Bailey
Teach g
i
t merget
o
ol t
o
use custom
commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
C
han
g
ed an
i
nternal
variable of mergetool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
ailey
Ti
d
y up git merge
t
ool'
s
b
ackup file beha
v
iour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
git
k
: Fix the Makefi
l
e to
cope wit
h
sy
s
t
e
m
s lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles
B
a
i
ley
Remove old gene
r
ated files
f
rom
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charl
e
s Bail
e
y
Fi
x
git-instaweb brea
k
ag
e
on MacOS X
d
ue to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Ch
a
rles Bailey
Fix clone not
t
o ignore dep
t
h when performin
g
a l
o
cal
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree