repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'sz/maint-submodule-reference-arg'
2012-10-25
Phi
l
Hor
d
git-pull: Avoid
m
erge
-
base on detached head
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phi
l
H
ord
stash: invo
k
e rerere in
case of co
n
flict
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil Hord
te
s
t:
g
it-st
a
sh conflict sets up rerere
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-03-08
P
hil Hord
rerere: Document 'rerere remaining'
Signed-off-by:
Phil Hord
<phil.hord@gmail.com>
commit
|
commitdiff
|
tree
2012-02-22
Phil Hord
cher
r
y-pic
k
: No adv
i
ce to
com
m
it i
f
--no-commit
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Hord
A
d
d
test sho
w
ing
git-fetc
h
gro
k
s gitfi
l
es
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Hord
Teach transport ab
o
u
t
the g
i
tfile me
c
ha
n
ism
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Ho
r
d
L
earn to handle g
i
tfi
l
e
s
in enter_
r
epo
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree