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
Merge branch 'ph/rebase-preserve-all-merges' into maint
2013-01-14
P
h
il H
o
rd
re
b
ase --pr
e
serve-merges:
keep all mer
g
e commits including
.
.
.
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil H
o
rd
Ad
d
tests for submodule sync --recursive
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil Hor
d
Teach -
-
recu
r
sive to submodule sync
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil Hor
d
t7407: F
i
x
r
ecursive
subm
o
dule
t
e
s
t
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-25
P
h
il Hord
git-pull: Avoid merge-base on detached head
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil Ho
r
d
stas
h
: in
v
o
k
e
r
erere i
n
case of
c
on
f
lict
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil Hord
te
s
t: git-stas
h
conflict sets up rerere
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-03-08
Phil Hord
rerere: Document 'rerere remaining'
Signed-off-by:
Phil Hord
<phil.hord@gmail.com>
commit
|
commitdiff
|
tree
2012-02-22
Ph
i
l
H
or
d
cherry-
p
ic
k
: No
a
dv
i
ce to commit if --no
-
commi
t
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Ph
i
l Ho
r
d
Add t
e
st sho
w
ing git-fetch g
r
oks
gitfiles
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil H
o
r
d
Tea
c
h tran
s
po
r
t a
b
out the gitf
i
le mechanism
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
P
h
il Hord
Lear
n
to handle gitfil
e
s in enter_repo
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree