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.2
2014-07-01
Charles Bailey
f
i
l
ter-branch: el
i
minate dupl
i
cate
mapped parent
s
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles
B
ailey
comp
a
t/b
s
wap
.
h: detect
endianne
s
s on more pla
t
forms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Baile
y
test
s
: don't
r
ely
o
n strerr
o
r
text when t
e
sting rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Char
l
e
s B
a
iley
di
r
.
c: make git_fnmatc
h
() not
inl
i
n
e
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Ch
a
rles Bailey
mergetool: Remo
v
e
ex
p
licit
refer
e
nces to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Bailey
stash tests:
s
tash can lose data in
a
file
re
m
oved
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles
B
ailey
stash:
Don't overwr
i
te files th
a
t
have gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Cha
r
les Bailey
Documentation: Describe ot
h
er
sit
u
at
i
ons where -z
a
ffects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Cha
r
les
B
ai
l
ey
Change xd
l
_merg
e
to generate o
u
tput
e
ven
f
or null mer
g
es
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles
B
a
i
l
e
y
t
6
023: m
e
rge-file fails
to output
a
n
y
thing for
a
degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Cha
r
les Bailey
mergetool: f
i
x running
m
er
g
eto
o
l
i
n sub-direct
o
r
ies
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Ba
i
ley
mergetool: Add a test for running m
e
rgetool
i
n a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
C
harles Bailey
mergetool: resp
e
ct auto
c
r
lf by using checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charle
s
Bailey
m
erget
o
ol: Don't keep temporar
y
merge f
i
l
e
s u
n
less
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Baile
y
mergetool: A
d
d prompt to
c
ontinue after faili
n
g to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
harles Bai
l
e
y
Add -y/--no-prompt option to
m
ergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fix s
o
me tab/space
i
n
c
ons
i
stencies in git-me
r
g
e
tool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles B
a
il
e
y
git-arc
h
i
ve
:
work in bare
r
epos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles
B
a
iley
Make git arc
h
ive r
e
sp
e
ct
c
or
e
.
autocrlf when c
r
eatin
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
harles Bailey
Add n
e
w test to demonstrate
g
it arc
h
i
v
e
core
.
aut
o
crlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rl
e
s B
a
iley
merge-too
l
d
ocumen
t
ation:
d
escribe custom co
m
m
a
nd usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
harles Bailey
g
it-mergeto
o
l document
a
iton: show toolnames in typew
r
i
t
e
r
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arl
e
s Bailey
Add
a
very basic test
s
cript
for git merg
e
tool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les Bai
l
e
y
Tea
c
h git m
e
rgetool to
u
se c
u
s
t
om comman
d
s
d
efined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es
B
a
il
e
y
C
han
g
ed an
i
nter
n
a
l
varia
b
l
e
o
f
mergetool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
T
idy u
p
git mergetool
'
s ba
c
kup f
i
le behavi
o
ur
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charl
e
s
Ba
i
le
y
gitk: Fix the Makefile to
c
ope with sys
t
ems
l
a
c
king
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
harles Bailey
Remove
old gener
a
ted
f
iles from
.
g
i
tignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
h
arles Bailey
Fix git
-
i
nsta
w
eb break
a
ge on Ma
c
OS X due to the lim
i
t
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Ch
a
rles Bailey
Fix
clone not to ignore depth wh
e
n performing a loca
l
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree