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
Merge branch 'da/mergetool-meld'
2014-10-15
Cha
r
les Bailey
difftool: don't assume that de
f
ault sh is sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles
B
ailey
merg
e
tool:
do
n
't requi
r
e a wo
r
k tree for --
t
ool
-
h
e
lp
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
Charles Bailey
Fix
contrib/subtree M
a
kef
i
le to p
a
tch #! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles
B
ailey
f
i
lte
r
-branch:
elim
i
nate duplic
a
te ma
p
ped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Ba
i
ley
compat/b
s
wap
.
h: detect
e
n
dianness on mor
e
platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
tests: do
n
't
r
e
l
y on strer
r
or t
e
x
t when tes
t
in
g
rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
h
a
r
les Ba
i
ley
d
ir
.
c: m
a
ke
git_f
n
match() not
inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bail
e
y
mergetool: Re
m
ove expli
c
it references to /dev/
t
ty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles
B
ailey
s
t
as
h
tes
t
s: s
t
a
sh can lose data i
n
a file
r
emove
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
harl
e
s
B
ailey
stash: Don't overwrite files that
ha
v
e g
o
ne
f
ro
m
the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bai
l
ey
Documen
t
ation: Describe other situ
a
tions wher
e
-z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
C
han
g
e xdl_merge to generate o
u
t
put
e
v
en for null merge
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Cha
r
les Ba
i
ley
t6023: merge-file
f
ails to
o
utput
a
n
y
t
hin
g
for a d
e
generate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
harles
Bailey
merget
o
ol: fi
x
runni
n
g me
r
geto
o
l in s
u
b-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Ba
i
ley
mergetool: Add a test for r
u
nning mergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Baile
y
mergetool: re
s
pect autocrlf b
y
using c
h
eckout-ind
e
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool: Don't keep tempo
r
ary merge fi
l
es unl
e
ss
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
harles Ba
i
ley
mergetool: Add pr
o
mp
t
to continu
e
after
f
ailing t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Add -
y
/--no-prompt option to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fix some tab/s
p
ace
i
n
c
onsistencies in git-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
g
it-archi
v
e: work
i
n
bare repo
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Cha
r
les
B
ailey
M
a
ke git
archive respec
t
core
.
autocrlf
wh
e
n
c
reating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Baile
y
Ad
d
new test
t
o de
m
o
nst
r
ate g
i
t archive core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Cha
r
les Bailey
merge-tool documentation:
d
escribe custom c
o
mmand
u
sage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
git-merge
t
o
o
l docum
e
ntaiton: sho
w
t
oolnames in typewrite
r
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Bailey
Add a very
b
as
i
c te
s
t scrip
t
for git
m
erge
t
oo
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles Bailey
Teach
g
it merge
t
ool
t
o use c
u
stom
commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bailey
Chan
g
ed an
i
nternal vari
a
b
l
e of mergetool to su
p
port
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
e
s Bailey
Ti
d
y
u
p
gi
t
mergetool
'
s ba
c
kup file behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Char
l
es
Bailey
g
i
tk: Fix the M
a
kefile to cope with systems la
c
ki
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles B
a
iley
Remove old gen
e
rated files from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bai
l
e
y
F
i
x gi
t
-instaw
e
b
breakage on
Mac
O
S X due to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
harles Bailey
Fix c
l
one
n
ot to ig
n
ore de
p
t
h
wh
e
n pe
r
forming a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree