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 git://git.bogomips.org/git-svn
2013-04-23
Phil
Hord
re
b
ase: find
o
r
ig_head
unambiguo
u
sly
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2013-03-13
P
h
il Hord
tag
:
--force d
o
es not
h
ave to warn when cre
a
ting tags
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2013-01-14
Phil
Hord
rebas
e
--preserve-m
e
rges: ke
e
p al
l
m
e
rge
c
o
mmits
including
.
.
.
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phi
l
H
o
r
d
Add tests for submodul
e
sync --recursive
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil Hord
Teach --r
e
c
ursive
t
o sub
m
odule sync
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil
Hord
t7407: Fi
x
re
c
u
r
sive submo
d
ule test
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-25
Ph
i
l Hor
d
g
i
t-
p
ull: Avoid mer
g
e-base on deta
c
hed head
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil Hord
stash: invoke rerere
in case of
c
onflict
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil
Hor
d
test
:
git-sta
s
h
c
o
nfli
c
t sets u
p
rer
e
re
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-03-08
P
h
il Hord
rer
e
re: Documen
t
'
r
erere remaining'
Signed-off-by:
Phil Hord
<phil.hord@gmail.com>
commit
|
commitdiff
|
tree
2012-02-22
Phil Hord
c
h
e
r
ry-pick: No advice to commit if --no
-
commit
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil
H
ord
A
dd test showing git-fetch groks gitfil
e
s
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil
H
ord
Teach tra
n
sport
ab
o
ut the gitfile mechanism
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Hord
Learn
t
o handle gitfiles
in
enter_rep
o
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree