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.5
2015-07-17
Charles Bailey
untrac
k
ed: f
i
x detection of
u
na
m
e(2) failure
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-25
Cha
r
le
s
Ba
i
l
e
y
Fix definition o
f
AR
R
AY_SIZ
E
f
o
r
non-gcc builds
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles Bailey
contrib/subtree: sma
l
l tidy-up to test
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Char
l
es Bailey
con
t
r
i
b/subtree: fix
b
roke
n
&&-chains an
d
revea
l
ed
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles Bailey
contrib/sub
t
r
e
e: use tabs c
o
nsitently for ind
e
ntation
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
diffto
o
l: don't as
s
ume
t
hat
d
efault sh is
s
ane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles
Bailey
mergetool: don't
require
a
w
o
r
k
tree f
o
r --tool-help
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
Ch
a
rles
Bailey
Fix cont
r
ib/s
u
btree Makefile to patch #! l
i
ne
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
C
harles
B
aile
y
filte
r
-branch: eliminate
duplic
a
t
e mapped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Char
l
es Bailey
c
ompat/bswap
.
h
: d
e
tect endi
a
nnes
s
on more
platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles
Bailey
tests: don
'
t rely on strerror
t
ext when testing rmdi
r
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles B
a
iley
d
ir
.
c: make
g
it_
f
nmatch() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
C
h
a
r
les Bailey
mergetoo
l
: Remove
e
xplicit
refe
r
en
c
es to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charle
s
Bail
e
y
stas
h
t
e
s
t
s: stash can l
o
se data in a
f
ile removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
rles Bailey
stash: Don't
o
verwrit
e
files
t
hat ha
v
e gone
f
rom
t
he
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
Documentati
o
n:
D
es
c
ribe othe
r
situatio
n
s wh
e
re
-
z
affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charl
e
s Bailey
Change x
d
l_
m
erge to genera
t
e output eve
n
for null m
e
rge
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
arles Bailey
t6023
:
merge-file fails to output an
y
thing for
a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Char
l
es Bailey
me
r
g
etool: fi
x
running mergetool in
su
b
-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charl
e
s
Bailey
mer
g
etool: Ad
d
a
test for running
m
ergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles B
a
iley
merge
t
ool:
r
espect autocrlf by
using
checkou
t
-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Cha
r
les Bailey
m
e
rgetool: D
o
n't keep
temporary m
e
rge files unl
e
s
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charle
s
Baile
y
mergetool: Add promp
t
t
o
con
t
inue
after
f
ai
l
i
n
g to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Ba
i
le
y
Add -y/--no-
p
rompt option
t
o mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charle
s
B
a
iley
Fix some tab/sp
a
c
e inconsi
s
te
n
cies in git-m
e
rgetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Ch
a
rles Bailey
g
i
t-arc
h
ive: work in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make git arc
h
ive resp
e
ct core
.
auto
c
rlf when cre
a
t
ing
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bai
l
ey
Add new test
to demonst
r
ate
g
it archive
c
ore
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bail
e
y
m
erge-tool do
c
u
m
ent
a
tion:
describe cus
t
om comm
a
nd usag
e
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
git-mergetool d
o
cumentaiton: s
h
ow toolnames in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bai
l
e
y
A
dd a
very basic test script for gi
t
merg
e
tool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les Bai
l
ey
Teach git me
r
getoo
l
to use custom
commands def
i
ned
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bai
l
e
y
C
h
anged an
i
nternal
v
ar
i
able of mergetool to su
p
port
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tidy up git mergetool's bac
k
up file behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charle
s
Bailey
gitk: Fix the Mak
e
f
ile t
o
cope wit
h
systems lac
k
ing
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
Remove o
l
d generated f
i
l
es from
.
giti
g
nore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Baile
y
Fix git-instaweb brea
k
age on MacO
S
X
due to the limite
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Ba
i
ley
F
ix clone not
to ignore depth when performing a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree