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
Sync with 2.0.4
2014-07-21
C
harle
s
Bailey
Fix contrib/subtree
Mak
e
file
t
o patch #! l
i
ne
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles Bailey
filter-br
a
n
ch: elimi
n
ate
d
upl
i
cate
m
apped pare
n
ts
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
C
h
arles Bailey
c
ompat/bswa
p
.
h
:
de
t
ect endia
n
ness
on more pl
a
t
forms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles B
a
iley
t
e
s
t
s: do
n
't rely on strerror text wh
e
n testing rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Ch
a
rles Bailey
di
r
.
c:
m
ake
g
it_fnma
t
ch() n
o
t inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Char
l
es
Bailey
m
e
rg
e
t
o
ol: Remov
e
explici
t
re
f
erences to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Ba
i
ley
stash tes
t
s
:
s
t
ash c
a
n
lose data in a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
harles Bailey
st
a
sh: Do
n
't o
v
erw
r
ite
files that ha
v
e gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Cha
r
les Bailey
Documentat
i
o
n: Describ
e
o
t
her situations wh
e
re -z affect
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
C
h
an
g
e
xdl_merge
to
g
ener
a
te out
p
ut
e
ve
n
for
n
ull merg
e
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charl
e
s Bailey
t6023: me
r
ge-f
i
le
f
ails to outp
u
t an
y
thing
f
or a de
g
enerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
a
rl
e
s Bailey
merg
e
tool:
f
ix running mergetool in s
u
b
-
directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles
Bailey
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
B
a
i
ley
m
e
rgetoo
l
:
respect autocr
l
f
by usi
n
g checkout-
i
n
dex
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
merget
o
ol: Don't keep te
m
po
r
ary merge
files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
merget
o
ol: Add pr
o
mpt to co
n
tinue a
f
te
r
failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
les Baile
y
Add -y/--no-prompt optio
n
to me
r
getoo
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fi
x
some t
a
b
/
space i
n
consistenci
e
s in git-merget
o
ol
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bail
e
y
git-ar
c
hive: work
i
n
bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make git a
r
chive respect core
.
autocrlf when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
harles
B
ail
e
y
Add new test to demonst
r
a
te git archive c
o
re
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles B
a
iley
merg
e
-tool documentation: describe custom command usag
e
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bai
l
ey
git-m
e
rge
t
ool documentaiton:
s
how too
l
names in t
y
pewrit
e
r
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles
Bailey
Add a very basic tes
t
script for g
i
t mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles Bailey
Teach git mergetool to use custom commands
defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Changed
a
n int
e
rnal varia
b
le
o
f mergetool t
o
support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tidy
u
p
git merge
t
ool's backup file behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gitk:
F
ix the Makefil
e
to cope wit
h
systems lacki
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
Remo
v
e
old ge
n
erated
files f
r
om
.
gi
t
ignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charl
e
s
Bailey
Fix
g
it-instaweb
b
reakage on MacOS X
d
ue to
t
he limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
h
arles B
a
i
l
ey
Fix clone
n
ot to ignore
depth w
h
e
n performing a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree