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
git-pull: Avoid merge-base on detached head
2012-10-25
Phi
l
Hord
git-pull:
A
v
oid merge-base on d
e
tached head
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
P
h
il Hord
stas
h
: invoke rerere
i
n ca
s
e
o
f conflict
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil Hord
t
e
st: git-sta
s
h conflict sets
u
p
r
ere
r
e
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-03-08
Phil
Hord
re
r
ere
:
D
ocument 'rerere remaining'
Signed-off-by:
Phil Hord
<phil.hord@gmail.com>
commit
|
commitdiff
|
tree
2012-02-22
Phi
l
H
o
rd
c
her
r
y-pick: No a
d
v
ic
e
to commit if --no-commi
t
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil
Hord
Add
t
est
showing git-fetch groks g
i
tfiles
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
P
h
il Hord
Teach transport about t
h
e gitfile mecha
n
ism
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
P
h
i
l
Hord
L
e
a
rn to h
a
nd
l
e gitfile
s
in enter_r
e
po
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
