repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add -y/--no-prompt option to mergetool
2008-11-15
Charle
s
Bailey
Add -y/-
-
n
o-prompt optio
n
to mergetool
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-11-15
C
harles Bailey
F
ix s
o
me tab/s
p
ace
i
ncons
i
s
t
e
n
cies in git-mergetool
.
s
h
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
g
i
t-archive: wor
k
in bare repos
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-09-19
C
h
arles Ba
i
ley
Make git archive
respect core
.
autocrlf
w
hen
creatin
g
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-09-19
Charles
B
a
i
ley
Add new te
s
t to
d
e
m
onstrat
e
git
a
rchive
c
o
r
e
.
autocrlf
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bail
e
y
merge
-
too
l
docume
n
tation: describe
c
ustom
comman
d
usage
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
C
h
arles Bailey
gi
t
-merget
o
ol documentaiton: sh
o
w
toolnames in typewriter
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles
Bailey
Add a very
b
asic t
e
st scr
i
pt for git mer
g
eto
o
l
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charles Baile
y
Teach gi
t
me
r
ge
t
ool to use cust
o
m comman
d
s def
i
ned
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bailey
Chang
e
d
an i
n
ternal vari
a
ble of mergetool to suppo
r
t
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
aile
y
Tid
y
up
g
i
t
m
ergetoo
l
's backup file behaviour
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-01-11
C
harle
s
Bailey
gitk: F
i
x the Makefile to cope with syst
e
ms lacking
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-21
Charl
e
s Bailey
Remove old g
e
nerated files
from
.
gitignor
e
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
Fix gi
t
-instaweb breakage on M
a
cOS X d
u
e to th
e
limited
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-12
C
h
a
r
l
e
s Bailey
Fix clo
n
e not
to ignore depth whe
n
performing a local
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree