repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t7810: fix duplicated test title
2016-06-21
Charles Bail
e
y
t78
1
0: fix
duplicated test title
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bail
e
y
mergetoo
l
: Rem
o
ve explicit re
f
er
e
nces to /dev
/
t
ty
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2010-04-20
Charles Bailey
st
a
sh
t
e
sts: stash ca
n
los
e
dat
a
in a file removed
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bail
e
y
stash:
D
o
n't ove
r
write
files that have g
o
n
e
from
t
he
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
rles Ba
i
l
e
y
Documentation
:
Describe other situations whe
r
e -z affec
t
s
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
C
hange
xdl_merge to ge
n
erate
o
utput even
f
or
n
u
l
l me
r
g
es
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bail
e
y
t
6
023
:
me
r
ge-file
fails to outp
u
t anything fo
r
a
d
e
generate
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
me
r
getool: fix running mergeto
o
l in su
b
-director
i
e
s
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bai
l
ey
mergeto
o
l: Add a test fo
r
runn
i
ng
m
ergetool in
a
s
u
b
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2009-01-27
Charles
B
aile
y
me
r
getool
:
respect autocr
l
f by using
c
heckout-
i
ndex
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-12-13
Cha
r
les Ba
i
l
ey
me
r
getool: Don't
k
eep temporary merge files
u
nless
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-12-13
C
ha
r
les Bailey
mer
g
eto
o
l: Add prompt
t
o continue after failing to
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Add -y/--
n
o-prompt op
t
ion to merg
e
tool
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-11-15
Charles
Bailey
F
i
x some tab/space inconsistencies in git-mergetoo
l
.
sh
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-10-26
Charles
B
ailey
git-archive: wo
r
k
in bare repos
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-09-19
Char
l
es Bailey
Make git archive respect core
.
a
u
tocrlf when creati
n
g
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-09-19
C
harles Baile
y
Add new t
e
st
t
o demonstra
t
e git arch
i
v
e
core
.
autocrlf
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rles Bailey
merge-tool do
c
umen
t
ation: descri
b
e
custom com
m
and usage
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
Charles B
a
iley
gi
t
-mergetoo
l
do
c
umentaiton: show tool
n
a
mes in t
y
pewriter
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s Bailey
A
d
d a very basic
t
est sc
r
ipt
f
or git mergetool
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bailey
Teach git mer
g
et
o
ol t
o
use custom com
m
ands defined
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les
Ba
i
ley
Chang
e
d an
in
t
e
r
nal variable of mer
g
etool to sup
p
ort
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bailey
Tidy up
g
i
t
mergetoo
l
's backup file behaviour
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-01-11
C
h
arl
e
s Bailey
g
i
t
k:
F
ix th
e
Makefi
l
e
to
c
ope with systems lacking
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-21
Charles
Bailey
Remove old generated fi
l
es from
.
gitign
o
re
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-19
Charles B
a
iley
Fix git-
i
nstaw
e
b
bre
a
k
age on MacOS X
due to t
h
e limi
t
ed
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-12
Charles Baile
y
Fix cl
o
ne not to ignore
d
epth w
h
en performing a local
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
