repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git submodule: ignore dirty submodules for summary and status
2010-04-18
Charles Bailey
Docu
m
entation: Descri
b
e other situ
a
tions
w
h
e
r
e -z
a
ffects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Cha
r
les Bail
e
y
Ch
a
nge xdl_merge to g
e
n
e
rate output even for null mer
g
e
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Char
l
es B
a
il
e
y
t6023:
m
erge-file fails to output anything for a
d
eg
e
n
e
rate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
mergeto
o
l: f
i
x
r
un
n
ing m
e
r
g
eto
o
l in sub-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
merget
o
ol: Add a test for ru
n
ning mergetool in a
sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
C
h
a
rles Bailey
m
erg
e
t
o
ol: respec
t
autocrlf by u
s
ing checkout
-
i
nd
e
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Ch
a
rles
Ba
i
ley
mergetool: Do
n
't k
e
ep
temporary merge
f
iles unl
e
ss
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Ba
i
ley
mergetool: Add prompt to continue after f
a
iling to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Add -y/--no-prompt option
to
m
ergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bail
e
y
Fix some
ta
b
/space inco
n
sistencie
s
in g
i
t-merg
e
tool
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
git-archiv
e
:
work in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make git archive respect core
.
autocrlf
when cr
e
ating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
harles Baile
y
Add ne
w
te
s
t to dem
o
nstrate git arch
i
ve cor
e
.
au
t
ocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charle
s
Baile
y
mer
g
e-
t
ool documentatio
n
:
d
e
scribe custom command us
a
g
e
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles B
a
iley
git-merge
t
ool documentai
t
o
n
: show toolname
s
in
t
ypewr
i
ter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Bail
e
y
A
d
d a ver
y
basic test scrip
t
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 mergetool to
u
se
c
ustom comm
a
nds de
f
ined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s Bailey
Chan
g
ed an internal variable of merg
e
tool to su
p
por
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bai
l
ey
Tidy up
git mergetool's
b
ack
u
p
f
il
e
behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gitk:
F
ix
t
he
Makefile
t
o
c
ope
w
i
th syst
e
ms lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Baile
y
Remove
o
l
d generated files from
.
g
i
t
i
gnore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
F
ix gi
t
-i
n
staw
e
b breakage on
MacOS
X due
to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fix c
l
one not to ign
o
r
e
depth when
p
e
r
forming a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree