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
show-branch: use argv_array for default arguments
2015-06-25
Charles
Bai
l
ey
Fix
definition
o
f ARRAY_
S
I
ZE for
n
o
n
-gcc b
u
ild
s
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles Baile
y
d
ifftool: d
o
n't as
s
ume that default sh is sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Cha
r
les Bailey
m
e
rg
e
tool: do
n
't
re
q
uire a wo
r
k t
r
ee for --t
o
ol-help
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
C
h
arles
Bailey
Fix contr
i
b
/
subtree Mak
e
file to patch #! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles Bailey
filter-branch: e
l
imina
t
e d
u
plicate mapped
p
a
rents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Ch
a
rle
s
Bailey
c
o
mpat/bswap
.
h: detect e
n
dianness o
n
more pla
t
forms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Cha
r
les B
a
i
ley
t
e
sts:
do
n
't r
e
l
y
on strerro
r
text when test
i
ng rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
harles
B
ailey
dir
.
c
: make git
_
fnmatch() not
i
nline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
C
harle
s
Bailey
mergeto
o
l:
R
e
m
ove explicit refe
r
ence
s
to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Cha
r
les Bail
e
y
stash t
e
sts: stash can lose da
t
a in a file remo
v
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
st
a
sh: Don't overw
r
ite files
t
ha
t
have gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Cha
r
les
B
aile
y
Docume
n
tation: D
e
scribe other situations
wh
e
re -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Ba
i
ley
Chan
g
e xdl_merge to
generate
o
u
tput ev
e
n for nul
l
m
e
rges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
harl
e
s Bailey
t6023
:
merge-file fails
t
o
output anyth
i
ng for a dege
n
e
ra
t
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
merget
o
ol: fix running merge
t
o
o
l in sub-directorie
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
mer
g
etoo
l
: Add a test
f
or runn
i
ng mergetool
in a su
b
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Ch
a
rl
e
s
Bailey
m
e
rgetool:
respect autocrlf by using checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
harle
s
Bailey
m
erg
e
tool: Do
n
't keep
temporary me
r
ge fil
e
s
unl
e
ss
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles
B
ailey
mergetoo
l
: Add
prompt to contin
u
e af
t
er
f
a
i
lin
g
to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charl
e
s Bailey
A
d
d
-
y
/
--no-prom
p
t o
p
tion to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
ha
r
les
Baile
y
Fix some t
a
b/spa
c
e inconsisten
c
ies in
g
it-mergetool
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
C
h
arles Bailey
git-a
r
chive: work in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bai
l
ey
M
a
k
e git archive respect
c
ore
.
a
utocrlf when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Add new
t
est to demonstrat
e
git archive co
r
e
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles
B
a
iley
m
erge-t
o
ol docum
e
nta
t
ion: describe
c
ust
o
m command us
a
g
e
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rles Bailey
git-
m
erge
t
ool d
o
c
umenta
i
ton: show tool
n
ames in
t
ype
w
rit
e
r
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s
Bail
e
y
A
d
d a very b
a
sic t
e
st script for g
i
t mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Ba
i
ley
Teach
g
it mergetool
to use
cus
t
om commands defi
n
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les Bailey
Changed an
i
nternal varia
b
le of m
e
rgetool to sup
p
ort
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Ti
d
y
u
p g
i
t mergetool's backup
f
ile behavi
o
ur
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
g
i
tk: Fix the Makefile to
c
o
p
e with
s
ys
t
ems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Char
l
es
B
ailey
R
emov
e
old generated files from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Char
l
es Bailey
Fix git-instaweb
breakage
o
n MacOS X due
t
o
t
h
e limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fi
x
clone
not
to ignore depth when performing a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree