repo.or.cz
/
git
/
mingw
/
4msysgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mg/fix-log-mergetag-color' into maint
2014-07-01
Ch
a
rles Bailey
f
ilter-
b
ranch: elimina
t
e dup
l
icate mapped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charl
e
s Bailey
compat/bswap
.
h: d
e
tect
end
i
anness
on
more plat
f
orms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bai
l
ey
tests: don't rely on stre
r
r
o
r text when testi
n
g
rmdi
r
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
dir
.
c:
make git_fnmatch() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles
B
ailey
mergetool: Remove explicit
r
efere
n
ces to
/dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Bailey
sta
s
h tests: stash can
lose
data
in a f
i
le remove
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
sta
s
h:
Don't o
v
erwri
t
e files
t
hat ha
v
e g
o
n
e
from
t
he
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Cha
r
l
e
s Bailey
Docu
m
entation: De
s
cribe oth
e
r situations w
h
ere -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Ba
i
ley
C
h
ange xdl_merg
e
to generate outpu
t
even for
nu
l
l merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bai
l
ey
t6023
:
merge
-
file fails
to output anything for
a
degener
a
te
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charl
e
s Bail
e
y
merge
t
o
o
l: fix runni
n
g
mergetool in sub
-
dir
e
ctor
i
e
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
arle
s
Baile
y
mer
g
etool: A
d
d a te
s
t fo
r
running merge
t
ool
in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles
B
ailey
mergeto
o
l
:
respe
c
t a
u
tocrlf b
y
usi
n
g checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
m
e
rgeto
o
l
:
D
o
n't
k
eep temporary
m
erge
f
ile
s
unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Cha
r
les
Baile
y
mergetool
:
Add p
r
ompt t
o
continu
e
a
f
ter failin
g
to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Char
l
es Bai
l
ey
Add -y/--no-prompt o
p
t
i
on
to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
les Bai
l
ey
Fix some tab/space inconsistencies
i
n git-
m
erget
o
ol
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Baile
y
git-archiv
e
:
w
ork in bare re
p
o
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make g
i
t archive respect
c
ore
.
autocrl
f
when creatin
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles B
a
iley
Add
new
t
est t
o
de
m
onstrate git archive c
o
re
.
aut
o
crl
f
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rles Bailey
merge
-
tool documentation: de
s
c
ribe custom command usa
g
e
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charl
e
s B
a
ile
y
git-mergetoo
l
docu
m
en
t
a
i
ton:
s
ho
w
toolnames in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les Ba
i
ley
Add a
very
ba
s
ic
t
est script for git
m
e
rgetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bailey
Teach gi
t
mergetool to use
custom comman
d
s defi
n
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Chan
g
ed
an int
e
rnal variable of mergetool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Ba
i
ley
Tidy up gi
t
merg
e
too
l
's
backu
p
fi
l
e behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles
B
ailey
gitk: F
i
x the
Makefile
t
o cope with syst
e
ms la
c
ki
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Char
l
es Bailey
Remo
v
e
old
generated files fro
m
.
gitign
o
re
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles
B
a
iley
Fix g
i
t-instaweb breakage on MacOS X due t
o
th
e
limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fix clone not to
i
g
nor
e
depth when performing
a
local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree