repo.or.cz
/
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 'maint'
2013-04-23
Phil Hord
rebase: find
o
rig_head un
a
mbi
g
uous
l
y
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2013-03-13
Phil
H
o
r
d
tag: --force does
not
hav
e
to w
a
rn when creating tags
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2013-01-14
P
h
il Ho
r
d
rebase -
-
preserv
e
-
m
erges:
k
eep all merge com
m
its includ
i
ng
.
.
.
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Ph
i
l Ho
r
d
Add tests for
submodule
syn
c
--recurs
i
ve
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil Hor
d
Teach --recur
s
ive to submodule s
y
n
c
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil
Hord
t740
7
: F
i
x re
c
ur
s
ive submodule test
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-25
Phil
Hord
git-pull: Avoid m
e
rge-base
on deta
c
h
e
d head
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phi
l
Hord
st
a
sh
:
in
v
ok
e
rerere
in case of
c
onfl
i
ct
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil Hord
test: gi
t
-stash
con
f
l
ict sets up rerere
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-03-08
P
h
il Hord
rerere: Document
'rerere remaining'
Signed-off-by:
Phil Hord
<phil.hord@gmail.com>
commit
|
commitdiff
|
tree
2012-02-22
Phil Hord
c
h
erry-pick: No advice to
c
ommit if
-
-no-commit
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
P
h
il
H
ord
Add
t
est showing g
i
t-f
e
tch groks gitfiles
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phi
l
Hord
Teach tran
s
port about the gitfil
e
mec
h
anism
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Ho
r
d
Lear
n
to
handle gitfiles in enter_repo
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree