repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Make difftool.prompt fall back to mergetool.prompt
2010-01-18
Avery Pennarun
Ext
e
nd mer
g
e-subtre
e
t
ests to test -Xs
u
btree=di
r
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2010-01-18
A
very Pennarun
Teach git-pul
l
t
o pass
-
X<option> to
g
it-me
r
g
e
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
git merge -X<option>
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2009-11-30
Ave
r
y
Pe
n
narun
b
u
i
l
t
in-m
e
rge
.
c: call exc
l
ude_cmds()
corr
e
ctly
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-08-04
Avery
Pennarun
git-svn: Abo
r
t with an e
r
ror i
f
'fetch' parameter
i
s
.
.
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-08-02
A
very Penna
r
u
n
Te
a
c
h "git diff -p
"
Pascal/
D
elphi funcname
p
at
t
ern
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-07-17
Ave
r
y P
e
nnarun
R
e
word "your branch has d
i
verg
e
d
.
.
.
"
lines to reduce
.
.
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-06-29
A
very Pennarun
git
-
s
vn: avoi
d
filling u
p
the d
i
s
k
with temp files
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-06-14
Av
e
r
y Pennarun
git-svn: test that ex
t
ra blan
k
lines
a
ren't inser
t
e
d
.
.
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-06-14
A
v
e
r
y
Pennarun
g
i
t-svn: don't append extra new
l
ines at the end of
.
.
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-05-05
Avery P
e
nna
r
un
git-svn: add
do
c
um
e
ntation for
-
-
add-auth
o
r-fro
m
option
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-05-05
A
very Pen
n
a
run
git-svn
:
A
d
d -
-
add-author-
f
rom o
p
t
i
on
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-05-05
Avery
Pennarun
git-svn: add d
o
cumenta
t
ion for --use-
l
og-author op
t
i
o
n
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree