repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mh/replace-refs'
2015-06-25
Ch
a
r
l
es
B
ailey
Fix definition o
f
A
RRAY_SIZE for n
o
n-gcc buil
d
s
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles Bai
l
ey
contrib/sub
t
ree:
s
mall tidy-up to test
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charl
e
s
Bai
l
ey
co
n
trib/subt
r
e
e
: fix broke
n
&&-chai
n
s
a
nd reve
a
led
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Char
l
es
B
ailey
c
o
ntrib
/
subtree: use tab
s
consiten
t
ly for indentat
i
on
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles
B
ailey
difftool: don't as
s
ume that de
f
ault sh is sa
n
e
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
C
h
ar
l
es Bail
e
y
mergetool: don'
t
require
a
work tree fo
r
--tool-help
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
Charles
Bail
e
y
Fix contr
i
b/s
u
btree Makefile to patch #! li
n
e
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Cha
r
les
B
a
iley
f
i
l
ter-
b
ranch: el
i
m
i
n
a
t
e d
u
plicate mapped
p
arents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charle
s
Bailey
compa
t
/
b
swap
.
h:
d
ete
c
t end
i
anness
on more plat
f
orm
s
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles
B
ailey
t
est
s
:
don't rely on
stre
r
ror text wh
e
n testi
n
g rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Ch
a
rles Bai
l
e
y
d
i
r
.
c: make
g
i
t_f
n
matc
h
()
not i
n
line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Ba
i
l
e
y
mergeto
o
l:
Remov
e
ex
p
li
c
it re
f
er
e
nces to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
C
harles Bai
l
ey
sta
s
h t
e
sts: stash can lose data in a file
removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Ba
i
ley
sta
s
h: Don't over
w
r
ite files that
h
ave
g
one fro
m
the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles
B
a
i
l
e
y
Documentation: Describe oth
e
r situat
i
o
n
s
whe
r
e
-
z
a
ff
e
cts
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Cha
r
l
e
s B
a
iley
C
h
a
n
ge xdl_mer
g
e to generate o
u
tput e
v
en
for null
m
e
r
ges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t6023: mer
g
e-file fails to output a
n
yth
i
ng for
a
d
egenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles B
a
iley
merget
o
ol:
f
i
x
r
un
n
ing me
r
getool
i
n
sub-
d
irecto
r
ie
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
arles Bailey
mergetool: Add a test for runnin
g
mergetool in a
sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Baile
y
merget
o
ol: re
s
pect autocrl
f
by using checkout-in
d
ex
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Cha
r
les Bai
l
ey
m
e
rge
t
ool: Don
'
t
k
eep
temporary merg
e
f
i
les u
n
less
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bail
e
y
mergetool: Ad
d
p
rompt to con
t
inue aft
e
r failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charle
s
B
a
iley
Ad
d
-y/--no-prompt option to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
les Bailey
Fix s
o
me tab/space i
n
consistenc
i
es in git-merg
e
t
o
ol
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
git
-
arch
i
ve: work in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
rles B
a
il
e
y
Make git
a
rchive respect core
.
autocr
l
f when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Cha
r
les
Bail
e
y
Add new test to
demonstrate git arch
i
ve core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
merg
e
-tool docu
m
enta
t
ion: descr
i
be custom command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles
B
ailey
git-merge
t
ool docum
e
ntaiton: show toolnames in t
y
pewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles Bailey
Add a ver
y
basic test
s
c
r
i
pt
f
or git mergeto
o
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
ailey
Teach git
mergetool
to use custom commands define
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
C
hanged a
n
inter
n
al variabl
e
o
f
mergetool to sup
p
ort
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Bailey
Tidy up g
i
t
m
erge
t
ool's backup f
i
le behav
i
our
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gitk: Fix the Makefile to cop
e
with syste
m
s
l
acking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
Remove
old gen
e
rated fil
e
s from
.
g
i
tignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charl
e
s
Bailey
Fix
gi
t
-inst
a
web b
r
e
a
kage on Mac
O
S
X
d
ue to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fix
clone no
t
t
o ig
n
ore depth w
h
en p
e
rforming a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree