repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mergetool: Add a test for running mergetool in a sub-directory
2009-01-31
C
harles Bai
l
ey
mergetool
:
Add
a
test for running mergetool
in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bail
e
y
me
r
getoo
l
:
r
espect autocrlf by us
i
ng che
c
kout-in
d
ex
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Ch
a
rles Baile
y
mergetool
:
Don't kee
p
temp
o
r
a
ry merge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
harles
B
ailey
mergeto
o
l:
A
dd prompt
t
o continue
aft
e
r failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bai
l
ey
Add -
y
/--
n
o
-
prompt optio
n
to me
r
g
etool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arle
s
B
a
il
e
y
Fix so
m
e tab/space
i
nc
o
nsi
s
te
n
c
ies in
g
i
t
-mergetool
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
C
h
a
rles
Bailey
gi
t
-archiv
e
:
work in ba
r
e
repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Baile
y
Make git
a
r
chive respect core
.
autocrlf when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Add new t
e
s
t
to demonstrate git
archive core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
r
l
es Ba
i
ley
merge-to
o
l documentation: descr
i
be custom com
m
and usag
e
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bai
l
e
y
g
it-mergetool d
o
cumentaiton
:
show to
o
lnames in typewrite
r
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bailey
Add a very ba
s
ic tes
t
script for
git mer
g
etool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bail
e
y
Tea
c
h git
m
ergetool to
use custo
m
commands
d
e
fined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Changed
an internal variab
l
e
of mer
g
etool
to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arle
s
Bailey
Tid
y
up git mergetool's ba
c
k
up
f
ile behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
g
i
tk: Fix
t
he Makefile to
cope with systems
l
a
cking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bail
e
y
Remo
v
e
old gene
r
ated
f
i
l
e
s
from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
harles Bailey
Fix
g
it-i
n
sta
w
eb breaka
g
e on MacOS X due to the lim
i
ted
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bai
l
ey
Fix clone not to ignore
depth when
per
f
orming a l
o
cal
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
