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
mergetool: Remove explicit references to /dev/tty
2010-08-20
Ch
a
rl
e
s
Ba
i
ley
mergeto
o
l: R
e
move explicit references to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
C
h
arles
B
ailey
stash tests: stash can l
o
se data
i
n a file
removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charle
s
Bailey
st
a
sh: Don't overwri
t
e files tha
t
have gone
f
rom t
h
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
harles Bail
e
y
Documen
t
ation: De
s
cribe other
s
i
tuat
i
o
ns where
-z
a
f
f
ects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
harl
e
s Bailey
Change xdl_merg
e
to
generate ou
t
put even for null
merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Char
l
e
s
Bail
e
y
t
6
023
:
m
erg
e
-file fa
i
ls to ou
t
put anything for a
d
eg
e
n
e
rate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Baile
y
merget
o
ol: fix running merge
t
ool
in sub-di
r
ectories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles B
a
iley
mergetool: Add
a test for r
u
nning
m
e
rgetool in
a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charl
e
s Bailey
mer
g
etool:
respect a
u
tocrlf
b
y using checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles
B
a
iley
mergetool: Don't keep temporary merge fil
e
s unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles
Bai
l
ey
m
ergetool: Add prompt to con
t
i
nue after fail
i
ng to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
les Bailey
A
dd -y/--no-prompt opt
i
on to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
a
rle
s
Bai
l
ey
Fi
x
some tab/sp
a
c
e incons
i
st
e
ncie
s
in git-m
e
rge
t
ool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
g
i
t-arc
h
i
ve: w
o
rk i
n
bare re
p
os
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Char
l
e
s
Bail
e
y
Make git
a
rchive
r
espe
c
t core
.
aut
o
crlf
wh
e
n crea
t
ing
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Char
l
es Bailey
A
dd new test
t
o demon
s
trate
g
it
a
rc
h
ive c
o
re
.
a
utocr
l
f
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
merge-tool docum
e
ntation: describe
cust
o
m com
m
a
n
d usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
arles
B
aile
y
git-mer
g
e
t
oo
l
document
a
i
ton:
s
how
toolnames
i
n typew
r
it
e
r
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Ba
i
ley
A
d
d a very basic t
e
st
s
c
r
i
pt
for gi
t
mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
a
r
les Bailey
Teach git merg
e
tool to use custom
commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Changed a
n
inter
n
a
l
variable of mergetool to sup
p
ort
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tid
y
up git mergetool's
b
a
ckup
f
ile behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gitk: Fix the Makef
i
le
to
cop
e
w
i
th systems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
Remove
o
l
d
g
enerated file
s
from
.
gitignor
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Ba
i
ley
F
i
x
git-instawe
b
breakage on Mac
O
S
X due to th
e
limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charl
e
s Bailey
F
ix clone not to igno
r
e depth when performing a
local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree