repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'nd/builtin-to-libgit'
2012-10-25
P
hil Hord
gi
t
-pull: Avo
i
d merge-b
a
s
e on
d
e
t
ac
h
ed head
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
P
hil Hord
stash
:
invoke rerere
i
n case of
c
onf
l
ict
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil Ho
r
d
t
est:
g
it-stash conflict sets
up r
e
r
e
re
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-03-08
Phil Hord
rerere:
D
ocument 'rerere remainin
g
'
Signed-off-by:
Phil Hord
<phil.hord@gmail.com>
commit
|
commitdiff
|
tree
2012-02-22
P
h
il H
o
rd
c
h
erry-
p
ick: No advic
e
t
o
commit if
--no-commit
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Hord
Add test
s
howing git-fetch gro
k
s gitfiles
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil H
o
rd
Teach t
r
ansp
o
rt about the gitfi
l
e
mechani
s
m
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Hord
Learn to handle gitfiles
in enter_r
e
po
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree