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
Merge branch 'da/mergetool-winmerge'
2015-06-25
Charles B
a
i
l
ey
Fix
definition of
ARRAY_S
I
ZE for non-gcc builds
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
diffto
o
l: don't
assume that defa
u
lt sh is sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
me
r
getool: do
n
't require a work tree for
--tool-help
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
C
harl
e
s Bailey
Fix contrib/
s
ubtree
M
a
kef
i
le to pa
t
ch
#
!
line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
C
h
arles Ba
i
ley
filter-branch
:
e
limi
n
ate duplicate mapped
p
a
r
en
t
s
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles
B
ailey
comp
a
t/bswap
.
h: det
e
ct endi
a
nn
e
s
s on mor
e
platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Ch
a
rles B
a
iley
tests: don't r
e
ly on st
r
error
te
x
t when testin
g
r
mdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Ba
i
le
y
dir
.
c: make git_fnmatch() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bailey
mergetool: Remove
ex
p
licit references to /
d
ev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles
Bailey
stash tests: stash
c
an lose data in a
fi
l
e re
m
oved
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Ba
i
ley
stash: Don't
overwr
i
te fil
e
s
that ha
v
e gon
e
from t
h
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
h
a
rles
Ba
i
ley
Documentat
i
on:
D
e
s
cribe other situations wher
e
-z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
Change xdl_m
e
rge to generate output e
v
e
n for null merge
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
arles B
a
ile
y
t
6023
:
me
r
ge-file fails
t
o output anyth
i
ng
for
a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
arles Bail
e
y
mergetool: fix r
u
nning
m
ergetool in
s
ub-directo
r
ies
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bail
e
y
mergetool: Add
a test f
o
r running m
e
rgetool
in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
C
ha
r
les Ba
i
ley
m
e
rgeto
o
l: respect autoc
r
lf by usin
g
checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool:
D
on't keep tempo
r
ary merge files u
n
less
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
ar
l
es
Bailey
mergetool
:
Ad
d
pro
m
pt to
c
o
ntinu
e
a
fter failin
g
to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bail
e
y
Add -y
/
--no-prompt option
to m
e
rgetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charl
e
s Bailey
Fix some tab/
s
pace i
n
consiste
n
cie
s
i
n
gi
t
-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles B
a
iley
gi
t
-archive: work in bare r
e
pos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bail
e
y
Make git archiv
e
res
p
ect co
r
e
.
aut
o
crlf
w
hen creati
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Ad
d
n
e
w test to demon
s
tr
a
te 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
e
r
ge-too
l
documentati
o
n: describ
e
custom co
m
ma
n
d
usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bai
l
e
y
git-mergetool documentaito
n
: show toolnames
in
typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s B
a
iley
Add a very bas
i
c te
s
t sc
r
ipt for
git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es B
a
iley
Te
a
ch
git mergetool to use
custom commands d
e
fined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles
B
ailey
C
h
anged
a
n
i
nternal variable
o
f mergetool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles B
a
il
e
y
T
idy up
git merget
o
o
l
's b
a
ckup f
i
le behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bai
l
ey
gitk: Fix the Makefil
e
to cope with system
s
lacki
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
R
emove
o
l
d
generate
d
f
iles
f
r
o
m
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Char
l
es
B
ai
l
ey
Fix git-instaweb break
a
ge on
MacOS
X
due to t
h
e li
m
i
t
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Ch
a
rles Bailey
Fix clo
n
e not to ign
o
re de
p
th when performin
g
a
l
o
cal
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree