repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Let ls-files strip trailing slashes in submodules' paths
2009-01-31
Char
l
es Bailey
mer
g
et
o
ol: fix running mergetool in sub-di
r
e
c
tories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Ba
i
ley
m
e
r
g
etool: A
d
d a test fo
r
running mergetoo
l
in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bail
e
y
mergetool:
r
e
s
p
ect autocrlf by using chec
k
out
-
index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles
Ba
i
ley
m
erg
e
t
ool: Do
n
't
k
eep t
e
mporary merge fi
l
es
unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
m
ergetool
:
Add p
r
o
mpt to continue after faili
n
g to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Ba
i
ley
A
dd -y/--no-prompt option to me
r
getool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
a
rles Bailey
F
ix so
m
e tab/space inconsistencies
in git
-
me
r
getool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
git-arch
i
ve
:
work i
n
bare re
p
os
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make
g
it archive re
s
pect
core
.
autocr
l
f
when cr
e
ating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bail
e
y
Add
n
ew tes
t
to dem
o
nstr
a
te git archive c
o
re
.
a
utocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Cha
r
les Bailey
m
e
rge-tool documentation: describe c
u
s
t
om command usa
g
e
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bail
e
y
git-me
r
getool document
a
it
o
n: show toolname
s
i
n
t
ypewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Bailey
Ad
d
a
v
e
ry basic
test
s
cr
i
pt for git merge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles
Bailey
Teach git mergetool to
use cu
s
tom commands
d
efined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bailey
C
hanged an inte
r
nal
variabl
e
of merge
t
ool to suppo
r
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tidy up
g
i
t mergeto
o
l's bac
k
up fi
l
e
b
ehavi
o
u
r
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gitk: Fix
t
he Makefile to
c
ope with syste
m
s lac
k
ing
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bai
l
e
y
Remove old gener
a
ted file
s
from
.
g
i
tigno
r
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Baile
y
Fix git-
i
nstaweb
b
reakage o
n
Mac
O
S X
d
ue to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
harles
Bailey
Fix c
l
one not to igno
r
e d
e
pth when performing
a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree