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
pull: allow pull to preserve merges when rebasing
2013-08-09
P
h
il
H
ord
t/t7
4
0
7: fix two typos in su
b
module tests
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2013-06-18
Phil
H
ord
f
i
x "b
u
i
l
tin-*" referenc
e
s to be "bu
i
lti
n
/*"
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2013-05-28
P
hil H
o
rd
trivial
:
Add mis
s
ing period in docume
n
tation
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2013-04-23
Phil Hord
rebase: find orig_head una
m
b
i
guously
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2013-03-13
Phil H
o
rd
tag: --force does not have to warn wh
e
n
creating tags
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2013-01-14
Phil Hord
rebase
-
-preserv
e
-me
r
ges: ke
e
p
all merge commits including
.
.
.
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil
Ho
r
d
A
d
d
tests
f
or s
u
bmodul
e
sync --recurs
i
ve
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil
H
ord
Teach --recursive
t
o
s
u
b
mo
d
ule
sync
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil Hord
t
7
4
07: Fix
re
c
ursive s
u
bmod
u
le t
e
s
t
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-25
Phil Hord
git-pull: Avoid merge-base on de
t
ac
h
e
d
he
a
d
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
P
h
il Hord
stash: invo
k
e rerere in c
a
se of conflict
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
P
hil Hord
t
est:
g
it-stash c
o
nflict sets u
p
rerere
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-03-08
Phil Hord
rerere: Documen
t
'
r
erer
e
r
em
a
in
i
ng'
Signed-off-by:
Phil Hord
<phil.hord@gmail.com>
commit
|
commitdiff
|
tree
2012-02-22
Phil Hord
c
her
r
y-pick: No advice t
o
commit if --no-com
m
i
t
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Hord
Add tes
t
showin
g
git-fetch
groks gitfi
l
e
s
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Hord
Teach transport about th
e
gitfile mecha
n
i
sm
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phi
l
Hord
Lear
n
to handle gitfiles
i
n enter_repo
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree