repo.or.cz
/
4msysgit-hv.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git config: trivial cleanup for editor action
2009-01-31
Charl
e
s Bailey
m
e
rgetool: fix running mergetool in
s
ub-direc
t
ories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Cha
r
les
B
ailey
mergetoo
l
: Add a te
s
t for r
u
nning mergetool in
a
s
ub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Cha
r
le
s
Bailey
mergetool: respect autocrlf by using
c
heckout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool: Don't keep temporary m
e
rge
files un
l
ess
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
a
rles B
a
iley
merge
t
ool: Add prom
p
t to
continue after failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Add
-y/--no-pr
o
mpt option to mergetoo
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
F
i
x some tab
/
spa
c
e
inconsistencies in git
-
mer
g
e
t
ool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Ba
i
l
e
y
git-ar
c
hive: work in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bail
e
y
Make g
i
t archive
respect core
.
a
u
tocrlf when
creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Cha
r
les
B
a
i
ley
Add new
t
est
t
o
demonstrate
git
archive
cor
e
.
autocrl
f
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
merge-t
o
ol
d
oc
u
m
e
n
t
a
ti
o
n: d
e
scribe custom
c
ommand usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Cha
r
l
es Bail
e
y
g
i
t-mergetoo
l
d
ocumentait
o
n
: sh
o
w toolnames in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arl
e
s
B
ai
l
ey
Add a very
b
asic test scrip
t
for git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
ar
l
es Ba
i
ley
T
each git merge
t
o
o
l to use cust
o
m c
o
mmands de
f
ined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Changed an inter
n
al variable of mer
g
eto
o
l to su
p
po
r
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Baile
y
T
i
dy
u
p git me
r
getool's b
a
ckup file be
h
avio
u
r
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Ch
a
r
l
e
s
Baile
y
gi
t
k: Fi
x
the Makefi
l
e to cope
with syst
e
ms lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
ha
r
les
B
ailey
Remo
v
e old generated
f
iles from
.
giti
g
nor
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
F
i
x git-ins
t
aweb breaka
g
e on Ma
c
OS X due
to
t
he limi
t
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fix clon
e
not to ign
o
re depth wh
e
n performing a loc
a
l
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree