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
Charles Ba
i
l
ey
merget
o
ol: Don't keep te
m
porary merg
e
files u
n
less
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-12-13
Charles
B
ailey
mergetool: Add p
r
ompt t
o
co
n
tinue a
f
te
r
fail
i
ng to
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-11-15
C
harles
B
ailey
Add -
y
/--no-prompt opt
i
on to mergetool
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
le
s
Bail
e
y
F
i
x
s
ome tab/spac
e
i
n
consistencie
s
in git-mergetool
.
s
h
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
git-archive: work in bar
e
repos
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make git a
r
c
h
iv
e
r
espect core
.
auto
c
rlf
w
hen
c
reating
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
A
d
d new test to demonstrate gi
t
arc
h
i
v
e
core
.
autocrlf
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
Charle
s
Bailey
merge-tool docu
m
entati
o
n: describe custo
m
command us
a
ge
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
Char
l
es
B
ailey
git-me
r
getool docu
m
e
n
ta
i
to
n
: sh
o
w
t
o
o
lname
s
in type
w
ri
t
er
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arl
e
s Bailey
Add a v
e
ry ba
s
ic test script fo
r
git
mergetool
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Teac
h
git mergeto
o
l
t
o
use cust
o
m
commands defined
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s Bailey
Changed an internal variable of mergetool to
s
up
p
ort
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s
Bail
e
y
Tidy up
git merge
t
ool's backup file behaviour
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
g
itk:
Fix t
h
e Mak
e
f
ile
t
o cop
e
w
i
th systems lacking
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
R
e
move ol
d
genera
t
ed files from
.
gitignor
e
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-19
Charl
e
s Bailey
Fix git-instaweb breaka
g
e
o
n
MacO
S
X due to the limited
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-12
Charle
s
Bail
e
y
Fi
x
clone not to igno
r
e depth wh
e
n performing
a local
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree