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
builtin-am: implement --ignore-date
2015-07-17
C
harl
e
s Bailey
untr
a
cked: f
i
x det
e
c
t
i
on of
u
name(2) failur
e
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-25
Cha
r
les Bail
e
y
F
i
x definition
o
f ARRAY_SI
Z
E for non-gcc builds
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles Bailey
contrib/subtr
e
e: small
t
idy-up to tes
t
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles Bailey
c
ontrib/subtree: fix broke
n
&
&-c
h
ains an
d
reve
a
led
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Cha
r
les Bailey
contrib/subtre
e
:
u
s
e tabs consitently for indentation
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
C
h
arles Bailey
parse-
o
pt
i
ons:
m
ove unsign
e
d
long option parsing out
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles
Ba
i
l
ey
te
s
t-pa
r
se-options: upda
t
e to hand
l
e ne
g
ative ints
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
C
harles Bailey
difftool: d
o
n't assume th
a
t d
e
fault sh is san
e
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
C
harles Bai
l
ey
mergetool: don't
require a work tree f
o
r --tool-hel
p
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
C
h
arles
Bail
e
y
Fix contri
b
/subtree Make
f
ile to pat
c
h
#! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Cha
r
les Bailey
filter-bra
n
ch: eliminate
d
uplicat
e
m
a
p
pe
d
pare
n
ts
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
C
h
a
rles Bai
l
ey
c
o
mpat/bswap
.
h: de
t
ect
endianness on
more
pl
a
t
forms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
tests: don't rely on strerror te
x
t when test
i
ng rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
harles Ba
i
ley
dir
.
c
: make git_fn
m
atch() not inlin
e
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Ch
a
rles Baile
y
mergetool: Remove expli
c
i
t
r
e
fere
n
ces to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Bailey
stash tests: stash can lose data in a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Char
l
es Bailey
stash: Don't over
w
rite files that
h
a
ve
g
one from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Ba
i
ley
Do
c
umentatio
n
: Descr
i
b
e othe
r
situations where -z
a
ffects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
a
r
les Bailey
Change xdl_merge to gene
r
a
te
o
utput even for n
u
ll me
r
ges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charl
e
s
B
ailey
t6023: merge-file fails t
o
o
utput anything
for a deg
e
nerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Char
l
es Bailey
mergetoo
l
:
fix r
u
nni
n
g
mergetoo
l
in su
b
-
directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
arles Bail
e
y
mergetool
:
Add a test for running
mergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charl
e
s Bailey
merg
e
to
o
l: respect
autocrlf by using checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
arles Bailey
mergetool
:
Don't kee
p
te
m
p
orary merge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Ch
a
rles B
a
i
ley
mergetool:
Add prompt to continue after
fail
i
ng to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Add -y/--no-pro
m
pt opt
i
on
t
o mergetoo
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
harles Bailey
Fix s
o
me tab/spa
c
e inconsistenci
e
s in git-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bai
l
ey
g
it-archive: work in b
a
re repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
harles Bailey
M
a
ke
g
it archive r
e
s
pec
t
cor
e
.
autocrlf w
h
e
n c
r
e
a
ting
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charl
e
s Bailey
Add new test to
d
emo
n
st
r
a
t
e
git arch
i
ve core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
merge-tool
d
oc
u
me
n
tation: descri
b
e cus
t
om command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Cha
r
les B
a
i
l
ey
git-mergetool d
o
cumentaiton
:
show
t
oolnames in typewrite
r
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
e
s
Bailey
Add a very bas
i
c test scrip
t
for git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
iley
T
each g
i
t mer
g
etool to use cu
s
tom commands de
f
i
n
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les Bailey
Changed
an
interna
l
v
ariable of
m
ergetool to suppo
r
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es
B
ail
e
y
T
i
dy u
p
gi
t
merget
o
ol
'
s bac
k
up file behavio
u
r
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles
B
a
i
ley
gitk:
Fix
t
he Makefi
l
e to cope with systems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
R
emo
v
e
old generat
e
d files
from
.
gitig
n
ore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bail
e
y
Fix git-instaweb
break
a
ge on
M
acOS X due to the
l
i
m
ited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charl
e
s Bailey
Fi
x
clone
n
o
t t
o
ig
n
o
r
e depth wh
e
n
pe
r
forming a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree