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
Teach git-pull to pass -X<option> to git-merge
2010-01-18
Avery Penn
a
run
Teach
g
i
t
-pull t
o
pass -X<option> to
g
i
t-m
e
rge
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
git merg
e
-
X
<
o
ption>
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2009-11-30
Avery P
e
nnarun
builtin-merge
.
c: call excl
u
de_cmds() c
o
rrectly
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-08-04
Ave
r
y
Pennarun
git-svn:
A
bort wit
h
an erro
r
i
f 'fe
t
ch'
pa
r
amet
e
r is
.
.
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-08-02
Avery Pennarun
Teac
h
"
git diff -p" Pas
c
al
/
Delphi funcna
m
e p
a
t
tern
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-07-17
A
ve
r
y
Pennarun
Reword
"
y
o
u
r branch has dive
r
ge
d
.
.
.
" lines to reduc
e
.
.
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-06-29
Avery Pennarun
git-svn: avoid filling up the di
s
k wi
t
h temp f
i
les
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-06-14
Avery Pennaru
n
git-svn: te
s
t tha
t
extra blank
lines a
r
en't inserted
.
.
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-06-14
A
v
ery Penna
r
u
n
git-s
v
n:
don'
t
append ext
r
a ne
w
l
ines at
t
h
e
e
nd o
f
.
.
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-05-05
Avery Pennarun
git-svn
:
a
dd documentat
i
on for --add-
a
uthor-from op
t
ion
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-05-05
Avery Penn
a
run
g
i
t-svn
:
Ad
d
-
-
add-au
t
ho
r
-
fro
m
o
ption
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree
2008-05-05
A
v
ery Pennaru
n
g
i
t-svn: ad
d
documen
t
ation for --use-log-author option
.
Signed-off-by:
Avery Pennarun
<apenwarr@gmail.com>
commit
|
commitdiff
|
tree