repo.or.cz
/
git
/
debian.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
Charles Bailey
F
i
x contrib/subtree Makefile
t
o pa
t
ch #!
l
ine
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Char
l
es Baile
y
filter-bra
n
ch: eli
m
inat
e
duplic
a
t
e
m
ap
p
ed par
e
nts
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Bai
l
ey
c
o
mpat/bswap
.
h: detect endianne
s
s on more platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Cha
r
l
e
s Bail
e
y
tests:
d
on't rely on s
t
rerr
o
r text w
h
en te
s
t
i
ng
r
m
dir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
h
arle
s
Baile
y
dir
.
c
: make
g
it_fnmatch() not inlin
e
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles
Bai
l
ey
mergetool:
R
e
move
e
xplicit references t
o
/
dev/t
t
y
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Bailey
stash te
s
ts: st
a
s
h
ca
n
l
o
se data in
a fi
l
e removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
stash: Don't o
v
erwrite fi
l
es that have gon
e
from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
h
arle
s
B
a
iley
Documentation: De
s
cribe other situations where -z affe
c
t
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charl
e
s Bailey
Change xdl_
m
erge to generate outpu
t
even for null m
e
r
ges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t6023: m
e
rge-
f
ile fails to output
a
n
y
thin
g
for a d
e
generate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Ch
a
rl
e
s
Bailey
mergetool: fix running mergetool in sub-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Char
l
es B
a
iley
me
r
g
etool: Add a test for
r
unni
n
g mergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
mergetoo
l
: respect
a
utocrlf by
usi
n
g checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charle
s
B
ailey
mergetool: Don't keep tem
p
or
a
ry
m
erge
f
i
les
unl
e
s
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mer
g
et
o
ol: A
d
d promp
t
to c
o
nt
i
nue after failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Ch
a
rles Bail
e
y
Add -y/--no-prompt
option to merget
o
ol
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Char
l
es B
a
iley
Fix some tab/spac
e
inc
o
nsistencie
s
in git-merget
o
o
l
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charl
e
s Bailey
git-archiv
e
: w
o
rk i
n
b
ar
e
repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charle
s
Baile
y
Make git archive r
e
spect c
o
re
.
auto
c
rlf wh
e
n
c
r
eating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
rles Bailey
Add
new test to demon
s
trate g
i
t arch
i
ve core
.
a
u
tocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Ba
i
le
y
merge
-
tool
d
ocumentation: desc
r
i
b
e
c
u
stom co
m
mand
u
sage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charl
e
s
Bailey
git-merg
e
tool
d
ocume
n
tai
t
on: show t
o
olnames in
typewrite
r
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Ba
i
l
e
y
Ad
d
a very basic
te
s
t s
c
ript for gi
t
mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
a
rles Bailey
T
each git merget
o
o
l
t
o use custom commands
d
efined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Bailey
Cha
n
ged an i
n
te
r
nal variable
o
f mergetool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Bailey
T
i
d
y
up
g
it m
e
rgetoo
l
's back
u
p file be
h
aviou
r
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Char
l
es Bai
l
e
y
gitk: Fix the Make
f
il
e
to cope with s
y
stems lackin
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
h
arle
s
Bailey
Remove old g
e
nerated fil
e
s
from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
h
a
rl
e
s Bailey
Fix git-insta
w
eb br
e
akage
on
MacOS X due t
o
the l
i
m
i
ted
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
h
arles Bailey
Fix clone not t
o
ig
n
ore
d
e
pth when per
f
ormi
n
g a loca
l
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree