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
mergetool: Add a test for running mergetool in a sub-directory
2009-01-31
Charles Bail
e
y
me
r
getoo
l
: Add a test
f
o
r
running mergetool in a sub
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2009-01-27
Charles B
a
iley
mergeto
o
l: respect a
u
toc
r
lf by using checkout-ind
e
x
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-12-13
Ch
a
rles Bailey
mergetool: Don't
k
eep te
m
p
o
r
ary me
r
ge files un
l
ess
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-12-13
Charle
s
Bailey
mergetool:
Add prompt to
c
o
n
t
i
nue after failing t
o
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
A
dd
-y/--no-prompt
option to
mergetool
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-11-15
Charles
Bailey
Fix some
t
ab/space inconsistencies in git-
m
e
rgetool
.
sh
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-10-26
C
h
a
rle
s
Ba
i
l
e
y
git-archive: work
i
n bare repos
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Ma
k
e
g
i
t
archi
v
e
r
esp
e
c
t core
.
autocrlf when
creating
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-09-19
Charles
B
ai
l
ey
Add new test to demonstrate git arc
h
i
ve core
.
a
u
tocrlf
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
merge-tool docum
e
ntation: d
e
scribe cus
t
om c
o
mman
d
u
s
age
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
Charles Ba
i
ley
git-mergetool documentaiton: show
tooln
a
mes in ty
p
ew
r
iter
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
l
e
s Bailey
Add a
very b
a
sic test
script for git mergeto
o
l
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Teach g
i
t merg
e
t
o
ol to use
c
ustom commands d
e
fined
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles
B
ailey
Changed an i
n
te
r
nal variable o
f
merg
e
tool to support
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
r
les Bailey
T
idy up
g
it me
r
g
e
too
l
's ba
c
kup
file b
e
ha
v
iour
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-01-11
Charles Ba
i
ley
gitk: Fi
x
t
h
e
Mak
e
file
to cope
with
s
ystems
l
acking
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
Remove
old generat
e
d
files from
.
g
i
t
ignor
e
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
Fix git-instaw
e
b br
e
akage
o
n MacOS X d
u
e to the limite
d
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-12
C
harles
B
a
il
e
y
F
i
x c
l
one not to
ignor
e
depth whe
n
performing a loca
l
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree