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 'jk/pull-into-dirty-unborn' into maint
2013-05-28
Phil Hord
trivial: Add missing peri
o
d in docu
m
e
ntation
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2013-04-23
Phil Hord
rebase: find orig_hea
d
unambig
u
ously
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2013-03-13
P
hil Hord
tag:
-
-fo
r
ce
d
oes not hav
e
t
o warn when creatin
g
t
ags
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2013-01-14
P
hil
Hord
rebase --preserve-merges
:
keep all merge co
m
mits in
c
ludi
n
g
.
.
.
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
P
hil Ho
r
d
Add te
s
t
s
for
submo
d
ule
s
y
n
c --rec
u
rs
i
ve
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil Hord
Teach --rec
u
rsive to
s
ubmod
u
le
s
ync
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil Hord
t740
7
:
F
ix re
c
ursiv
e
subm
o
dule test
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-25
Phil Hord
git-pull: Avoid merge
-
base on d
e
t
ached h
e
ad
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil Hord
s
tas
h
: invoke rerere in
case of conflict
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil Hord
t
e
s
t: g
i
t-s
t
ash con
f
lic
t
sets up r
e
rer
e
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-03-08
Phi
l
Hord
rerere:
D
o
cument 'rere
r
e remaining'
Signed-off-by:
Phil Hord
<phil.hord@gmail.com>
commit
|
commitdiff
|
tree
2012-02-22
P
hil
H
ord
cherry-pick:
No
a
dvice to commit if -
-
no-commit
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phi
l
H
o
rd
Add test
s
ho
w
ing g
i
t
-fetch
groks gitfiles
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Hord
Teach tra
n
sp
o
rt a
b
out the gitfile mec
h
a
nism
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil H
o
rd
L
earn
t
o hand
l
e
gitfiles in enter_repo
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree