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
A
ve
r
y
P
e
nnarun
Tea
c
h
git-pu
l
l
t
o pa
s
s -X<option> t
o
g
i
t-merge
Signed-off-by: Avery Pennarun <
apenwarr@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-18
A
v
ery Pe
n
narun
git m
e
rge -X<op
t
ion
>
Signed-off-by: Avery Pennarun <
apenwarr@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-30
Avery Penna
r
un
builtin-merge
.
c: call e
x
clude_cmds() correctly
.
Signed-off-by: Avery Pennarun <
apenwarr@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-04
A
v
ery Pennarun
git-svn: Abort
w
i
th an error
if 'fetch' parameter is
.
.
.
Signed-off-by: Avery Pennarun <
apenwarr@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-02
Avery
Penn
a
run
Teach
"git dif
f
-p"
Pascal/Delphi funcname p
a
ttern
Signed-off-by: Avery Pennarun <
apenwarr@gmail.com
>
commit
|
commitdiff
|
tree
2008-07-17
Avery Pennaru
n
Rew
o
rd
"your branch has
diverged
.
.
.
" lines to reduc
e
.
.
.
Signed-off-by: Avery Pennarun <
apenwarr@gmail.com
>
commit
|
commitdiff
|
tree
2008-06-29
Ave
r
y
Pennarun
git-svn:
a
vo
i
d
f
i
lli
n
g up the disk wit
h
temp files
.
Signed-off-by: Avery Pennarun <
apenwarr@gmail.com
>
commit
|
commitdiff
|
tree
2008-06-14
A
very Pe
n
nar
u
n
git-svn: test
tha
t
ex
t
ra bla
n
k
lines
aren't ins
e
r
t
e
d
.
.
.
Signed-off-by: Avery Pennarun <
apenwarr@gmail.com
>
commit
|
commitdiff
|
tree
2008-06-14
Avery Pen
n
arun
gi
t
-
svn: do
n
't app
e
nd ex
t
ra ne
w
lines at t
h
e end
o
f
.
.
.
Signed-off-by: Avery Pennarun <
apenwarr@gmail.com
>
commit
|
commitdiff
|
tree
