repo.or.cz
/
git
/
mingw
/
4msysgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-tool documentation: describe custom command usage
2008-03-08
Charle
s
B
a
i
l
ey
merge-tool doc
u
mentati
o
n
:
desc
r
ibe custom command usage
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
Charles
B
ail
e
y
g
i
t
-
m
er
g
e
t
ool doc
u
m
ent
a
ito
n
:
s
how toolnames in typ
e
writer
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Bailey
Add a very basic tes
t
script for git mergetool
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bailey
Tea
c
h git me
r
get
o
ol t
o
u
s
e
c
u
s
tom
c
om
m
a
nds
defined
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charles Ba
i
ley
Chan
g
ed
an int
e
rnal variable of
m
ergetoo
l
to support
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
a
i
l
e
y
Tidy up git me
r
getool's backup
file b
e
hav
i
our
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gitk: F
i
x the Makefile to cope with systems lacking
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-21
Charles
B
a
ile
y
Re
m
ove old generated files from
.
gitignore
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
Fix g
i
t-instaweb breaka
g
e on MacO
S
X
due to the limite
d
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-12
Cha
r
l
e
s Bailey
Fix
c
l
one not
to ig
n
ore
d
epth when perform
i
ng a
local
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree