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 'nd/edit-branch-desc-while-detached' into maint
2013-01-14
Phil Ho
r
d
rebase --preserv
e
-m
e
rge
s
:
ke
e
p al
l
mer
g
e comm
i
ts
i
n
c
l
uding
.
.
.
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil Hord
Add
t
ests
f
o
r
s
ub
m
odule sync --recursi
v
e
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil Hord
Teac
h
--recursive to submodule sync
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil Hord
t7407:
Fix
r
ecursive
s
ubmod
u
le te
s
t
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-25
Phil Ho
r
d
g
i
t
-pull: Avoid mer
g
e-
b
ase on deta
c
hed hea
d
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil Hord
stash: invoke
r
erere in cas
e
of co
n
fl
i
ct
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil Hor
d
t
e
st: git-st
a
sh confli
c
t se
t
s
up r
e
rere
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-03-08
Phil Hord
rerer
e
: Document 'rerere remaining'
Signed-off-by:
Phil Hord
<phil.hord@gmail.com>
commit
|
commitdiff
|
tree
2012-02-22
Phi
l
Hord
cherry-pick:
N
o a
d
vice t
o
c
o
m
mit if
-
-n
o
-commi
t
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil
Hord
Add test
showi
n
g git-fet
c
h g
r
o
k
s
g
itfiles
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phi
l
Hord
Tea
c
h transp
o
rt about the
g
itfile mechanism
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
P
hil Hord
Learn to handle git
f
ile
s
in enter_r
e
po
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree