repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'cb/maint-mergetool-no-tty'
2010-08-20
Charles Bai
l
e
y
me
r
g
e
tool: Remove explicit references to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charl
e
s
Bailey
stash tests: stash c
a
n lose d
a
t
a in a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
r
l
es Bailey
s
t
ash: Don't overwrit
e
files tha
t
have g
o
ne from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
harles Bailey
Documentation: Des
c
ribe other situations w
h
ere -
z
affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles
Bailey
Change xdl_merge to
generate output e
v
en for null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charle
s
Bailey
t6023: merge-file fails t
o
out
p
ut anything
for a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
arl
e
s Bailey
mergetool: fix runn
i
n
g
mergetool in sub-direc
t
ories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Cha
r
les Bailey
mergetool: Add
a test for
r
un
n
ing mergetoo
l
in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
C
h
arles Bai
l
ey
mergetool: respect
autocrl
f
by
u
s
i
n
g checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bai
l
ey
m
ergetool: Do
n
't keep t
e
m
por
a
ry merge files unles
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Char
l
es Bailey
me
r
geto
o
l: Add
p
r
om
p
t
to continu
e
after faili
n
g to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arles Bail
e
y
Add -
y
/--no-prompt option to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fix so
m
e tab/space i
n
consistencie
s
in
git-
m
erge
t
ool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Cha
r
les Bailey
g
i
t
-
arch
i
v
e
:
work in
b
are rep
o
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bail
e
y
Make
git archive respect
co
r
e
.
autocrlf
when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
h
a
rles Bailey
Add new test
to demonstra
t
e git archive core
.
a
utocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bai
l
ey
merge-tool docum
e
n
t
ation: descri
b
e
custom
c
om
m
and usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Cha
r
les Baile
y
git-mergetool documentaiton: s
h
ow tooln
a
mes in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles Bailey
Ad
d
a v
e
ry basic
t
es
t
s
cript for git me
r
ge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
l
es Bail
e
y
T
eac
h
gi
t
m
er
g
etool to use cust
o
m c
o
mmands
d
efi
n
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s
Ba
i
ley
Chan
g
e
d an int
e
rna
l
vari
a
ble of mer
g
etool
t
o
support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Ti
d
y
u
p
git mergetool
'
s backup
file beh
a
viour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Char
l
es Bailey
gitk
:
Fix the Makefile to cope w
i
th syste
m
s lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
h
arles Bailey
Remove
old generated fil
e
s from
.
g
it
i
gnore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
h
arles Bai
l
ey
Fix git-instaweb br
e
akage on MacOS X d
u
e
to t
h
e li
m
it
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charle
s
Bailey
Fix clone not to ig
n
ore de
p
th when performing a loca
l
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree