repo.or.cz
/
git
/
trast.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mergetool: Don't keep temporary merge files unless told to
2008-12-13
C
h
a
r
le
s
Bail
e
y
merge
t
ool: D
o
n't keep
t
empo
r
ary merge files unles
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Cha
r
l
e
s Bailey
mergetoo
l
: Add prom
p
t to continue
after f
a
iling to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arles Bailey
Add
-
y/--no
-
prompt opt
i
on to merget
o
ol
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
l
e
s Ba
i
ley
Fi
x
so
m
e tab/spac
e
incon
s
is
t
encies in
git-merge
t
ool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bail
e
y
git-archi
v
e: work in bare r
e
pos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles B
a
iley
M
a
ke g
i
t
archive respect
c
ore
.
autocrlf whe
n
creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
harles Bailey
Add new test to demons
t
rat
e
git archi
v
e cor
e
.
au
t
ocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charl
e
s
B
ailey
mer
g
e-tool documentation: describe custom c
o
mmand usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
git-mergetool documentaiton:
s
how toolnames i
n
type
w
riter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Ba
i
ley
Add a very basi
c
test sc
r
ipt for git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles
B
ai
l
ey
Tea
c
h git merge
t
ool
t
o
u
se custom comma
n
ds defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arle
s
B
a
iley
Ch
a
nged an intern
a
l variable
o
f mergetool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bai
l
e
y
Tidy up git mergetool's backup file behaviou
r
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Cha
r
l
e
s Bailey
gitk: Fix
t
he Makef
i
le
t
o
c
ope with sys
t
e
m
s
lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Ch
a
rles Bailey
Remov
e
old gener
a
ted files
f
rom
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
Fix gi
t
-instaweb breakage on MacOS
X
due to the limi
t
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
h
arles B
a
ile
y
F
ix clone not
t
o ignore depth
wh
e
n perfo
r
ming a loc
a
l
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree