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
Git 2.5.0-rc1
2015-06-25
Cha
r
les Bailey
Fix definitio
n
o
f
ARRAY_S
I
ZE f
o
r non-gcc builds
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles
Baile
y
diff
t
ool: don't assume
t
ha
t
d
e
fault sh is sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
C
h
arles Ba
i
l
e
y
mergetool:
d
on't require
a
work tr
e
e for --tool-
h
el
p
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
C
harles
Bailey
Fix
contrib/subtr
e
e Make
f
ile to
patch
#
!
line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Ch
a
r
les Bailey
fi
l
ter-b
r
anch: eliminate d
u
pli
c
ate mapped
parent
s
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Bail
e
y
compat/bswap
.
h: detect end
i
anness
o
n more platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
harles Bail
e
y
t
e
sts: don't r
e
ly on strerro
r
tex
t
w
h
en testing rm
d
ir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
dir
.
c
: make git_
f
nmatch()
n
ot
inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bailey
me
r
getool
:
Remo
v
e explicit
r
eference
s
to
/
dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Bailey
stash
t
e
s
ts: stash can
l
o
se
d
at
a
in a
f
ile removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
s
t
ash:
Don't
o
verwrite files that have gone from
t
h
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
h
a
rles Bailey
Do
c
umentat
i
on: Describ
e
other
situa
t
ions where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Ba
i
ley
Change xdl_me
r
ge to gener
a
te
output even fo
r
n
u
ll
mer
g
es
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
harles
Bailey
t6023: merge-file fails to
outp
u
t
anything for
a
degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
merge
t
ool: fi
x
running me
r
get
o
ol in s
u
b-d
i
r
e
ctories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
mergeto
o
l: Ad
d
a test for ru
n
n
ing mergetool in a su
b
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles B
a
i
ley
merge
t
ool:
r
esp
e
ct autocrlf by using checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bail
e
y
mergetool: Don't keep temporary merge f
i
les
unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
harles Bailey
mergetool: Add pr
o
mpt to continue after failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charl
e
s Ba
i
ley
Add -y/--
n
o-prom
p
t optio
n
to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Ba
i
le
y
Fix some tab/space inco
n
si
s
te
n
cie
s
in git-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
C
harles Bailey
git-archive
:
wo
r
k
i
n ba
r
e re
p
os
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
rles Bailey
Make g
i
t archive respect core
.
autocr
l
f when
c
reating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles
B
a
i
ley
Add new test to demonstrat
e
git ar
c
hive core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Cha
r
les Bailey
merge-
t
o
ol docume
n
tation: d
e
s
c
ribe c
u
stom command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
git-mergetool docume
n
taiton
:
show to
o
ln
a
mes
in t
y
pewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Baile
y
Add a v
e
ry basic test scr
i
pt for git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bail
e
y
Teach git m
e
r
g
etool
t
o u
s
e custom comman
d
s defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bai
l
ey
Changed an i
n
ternal varia
b
le of merge
t
ool to sup
p
o
r
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
r
les Bailey
Tidy up git mergeto
o
l'
s
b
ackup file behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charl
e
s Bailey
gitk: Fix th
e
M
a
k
efile to cope w
i
th sys
t
ems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
R
emove old generated fil
e
s from
.
gitign
o
re
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
Fix git-
i
ns
t
aweb break
a
ge 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 c
l
on
e
not to
ignore d
e
pth w
h
en performing a
l
o
c
al
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree