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
C
harles
B
ailey
D
o
cumentat
i
on: Desc
r
ibe
o
ther si
t
uations where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
Chang
e
xdl_merge to
g
enerate output even for nu
l
l
m
er
g
es
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles
B
ailey
t6023: m
e
rge-fi
l
e fails to
o
u
t
p
ut anything f
o
r a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles B
a
iley
mergetool:
fix r
u
nning mergetool in
s
ub-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Cha
r
les Bailey
mergetool: Add
a
t
est for running m
e
rgetool
in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Ba
i
ley
mergetool: respe
c
t autocrlf by usin
g
checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charle
s
Bailey
m
erg
e
to
o
l: D
o
n
'
t keep
t
emporary merge fi
l
es unle
s
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
arles
B
ai
l
ey
merge
t
o
o
l:
Ad
d
prompt to
continue after failing
to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
ar
l
es Bailey
Add
-
y/--no-prompt op
t
io
n
t
o
mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles
Bailey
Fix some tab/spa
c
e inconsistencies in git-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles
B
a
i
l
e
y
git-arc
h
i
ve:
work in bar
e
repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bail
e
y
Make
g
it
archi
v
e
respect co
r
e
.
autocrlf
w
h
en cre
a
t
in
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
rl
e
s Bai
l
ey
Add new
test
to d
e
monstrate git
a
rc
h
ive
c
ore
.
autocrl
f
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles B
a
il
e
y
merge-tool d
o
c
umentation
:
d
escribe c
u
stom c
o
mma
n
d u
s
age
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Char
l
es Bail
e
y
git-m
e
rge
t
o
o
l
doc
u
mentaiton: show toolnames in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Baile
y
Add a
very basic test script for git me
r
getool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les Ba
i
ley
Teach git mergetool to use custom comman
d
s
d
e
fined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles Bailey
C
h
anged an i
n
ter
n
a
l va
r
iable of
m
ergetoo
l
to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
ai
l
ey
Tid
y
u
p
git mer
g
e
t
ool's backup file
b
ehaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charle
s
B
a
i
l
ey
gitk: Fix
t
he Ma
k
efile to cope with systems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
h
arle
s
Bailey
Remov
e
old genera
t
ed files fro
m
.
giti
g
n
o
r
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
Fix git-inst
a
web bre
a
kage on MacOS X du
e
to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles
B
ailey
Fi
x
c
lone not to ignore d
e
pth when performing a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree