repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mergetool: Add prompt to continue after failing to merge a file
2008-12-13
Charles Ba
i
ley
m
ergetool
:
Add prompt to c
o
ntinue aft
e
r failin
g
t
o
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arles Bailey
Add
-y/--
n
o-prompt option to mergetool
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
l
e
s Bai
l
ey
Fix so
m
e tab/space i
n
c
o
n
sist
e
ncie
s
in git-mergetool
.
sh
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-10-26
Charles Baile
y
git-a
r
chi
v
e: work in bare repos
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bail
e
y
Make git archive
r
e
s
pect cor
e
.
autocrlf wh
e
n creating
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-09-19
Charles B
a
iley
A
d
d new test to demonst
r
ate
g
i
t arch
i
ve core
.
autocrl
f
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
Cha
r
les Bail
e
y
merge-
t
ool documentation:
describ
e
cust
o
m co
m
mand usag
e
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rles Bailey
git-mergetool documentai
t
on: show
t
o
o
lnames in
typewrite
r
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles B
a
iley
Add a ver
y
basic test script for
git me
r
getool
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Ba
i
ley
Teach git me
r
getool to use
custom
commands
d
efined
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Changed an internal v
a
riable
o
f mergetool
t
o support
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles Bailey
Tidy
u
p
git mergetool's
b
ackup file beh
a
vi
o
u
r
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gitk: Fix the Makefi
l
e to
c
ope w
i
th systems lack
i
ng
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-21
Charles
B
a
iley
R
emove o
l
d generated files f
r
om
.
gitignor
e
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-19
Charles
B
a
i
l
e
y
Fi
x
git-instaw
e
b br
e
akage on MacOS X
due
t
o th
e
limited
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-12
C
h
arl
e
s Bailey
Fix clone not
t
o
ignor
e
depth when
p
erforming
a
loc
a
l
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree