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
contrib/subtree: small tidy-up to test
2015-06-22
Charles Bailey
contrib/subtre
e
: small
t
idy-up t
o
t
est
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charle
s
Bailey
contrib/subtree: f
i
x broken &&-chains and reve
a
l
e
d
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles Ba
i
l
ey
contrib/subtree: use tab
s
consit
e
ntly for i
n
dentation
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
C
h
arles Ba
i
ley
difftool: don't assu
m
e
that default sh is sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
C
harl
e
s Bailey
mergetool: don'
t
r
equire a work
t
ree for --t
o
ol-he
l
p
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
Charles Ba
i
le
y
Fi
x
contrib/
s
ubtree
Makefile to patch #!
l
ine
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles
Bai
l
ey
filter
-
branch: eliminate
duplicate mapp
e
d
p
aren
t
s
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
C
h
a
r
l
es Bailey
c
omp
a
t/b
s
w
a
p
.
h
:
det
e
ct endianne
s
s on more p
l
at
f
orms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles
B
ailey
t
ests: don
'
t rely on strerror
text
w
hen t
e
sting rm
d
ir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
dir
.
c
: mak
e
git_fn
m
at
c
h() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles
Bailey
mergetoo
l
:
Rem
o
ve expl
i
cit references to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Char
l
es Bailey
s
t
a
sh tests:
s
t
a
sh can lo
s
e
dat
a
in a
file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bai
l
ey
s
t
ash: Don't ove
r
w
rit
e
f
i
les that ha
v
e gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
Docu
m
e
ntation: Desc
r
ib
e
oth
e
r s
i
tuations where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
a
r
les Bail
e
y
Change xdl_merge
t
o genera
t
e output
ev
e
n
f
o
r null m
e
r
g
e
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
a
rles Bailey
t6023: merge-file fails to output anything for a
dege
n
era
t
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
mergetool: f
i
x ru
n
ning mergetool 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 for running mergetool
in a
sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles
B
ailey
mergetool: res
p
ect autocrlf
b
y using
c
h
eckout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles
B
ailey
mergeto
o
l: Don
'
t keep
temporary merge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charl
e
s
B
a
iley
mergetool: Add prompt to continue after
f
ailing
t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
ha
r
les Baile
y
Ad
d
-
y/--no-prompt
o
ptio
n
to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Ch
a
r
l
e
s
Bailey
Fi
x
s
o
me tab/
s
pace
i
nconsistencies in git-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Char
l
es Bai
l
ey
gi
t
-archive: wo
r
k in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charl
e
s Bailey
Ma
k
e git archive respect core
.
autocrlf when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
h
arl
e
s Bailey
Add new t
e
st to de
m
onstrat
e
git archive
core
.
autoc
r
lf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
me
r
ge-tool documentation:
describe custom comman
d
usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charle
s
Bailey
git-merg
e
tool
d
o
cu
m
entaiton: show to
o
l
names i
n
typew
r
i
t
er
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s
B
ailey
Ad
d
a ver
y
basic test
s
cript for git mer
g
etool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Teach
git m
e
rgetool to u
s
e custom commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bail
e
y
Chan
g
ed an
i
ntern
a
l
v
ariable
o
f mergetool
t
o
support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les Bai
l
ey
Tidy u
p
git mergetool's ba
c
kup
file behavio
u
r
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles B
a
iley
g
i
tk: F
i
x the
M
akefi
l
e to cope with
system
s
l
acking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Ch
a
r
l
es Baile
y
Remove old generated files from
.
g
itignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Ch
a
rles Bailey
F
i
x
g
it-instaweb
break
a
ge
o
n
M
acOS X du
e
to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charle
s
Bailey
Fix clone not to
ignore depth wh
e
n p
e
r
f
orming a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree