repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Sync with maint
2015-03-26
Ph
i
l Hord
git-push
.
txt:
clean up
f
or
c
e-wit
h
-
l
ease w
o
rding
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2013-08-09
Phil Hord
t/t7
4
07: fix two typos i
n
submodule tests
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2013-06-18
P
hil Hord
fix "b
u
iltin-*" re
f
erences to be "bu
i
l
tin/*"
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2013-05-28
Ph
i
l Hord
trivia
l
:
Ad
d
mi
s
sing pe
r
iod i
n
documentat
i
on
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2013-04-23
Phil H
o
r
d
r
e
base
:
f
i
nd orig_head u
n
a
mbiguo
u
s
ly
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2013-03-13
Phil
H
o
rd
t
ag:
--for
c
e
does not
have to warn
w
h
en creatin
g
ta
g
s
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2013-01-14
Phi
l
H
o
rd
rebase --p
r
es
e
rve-mer
g
es:
k
eep all merge commits including
.
.
.
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phi
l
Hord
Add tests for submo
d
ule s
y
nc --recurs
i
ve
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Ph
i
l
H
o
rd
Teach --recursive to submod
u
le sync
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil Hord
t
7
407: Fix
recursive sub
m
odule
test
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-25
P
hil Hord
git-pull: Avoid merge-ba
s
e
on de
t
ached head
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
P
hil Ho
r
d
s
tash: invoke rere
r
e in ca
s
e of conflict
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phi
l
H
o
rd
test: git-stash conflict sets up
rerere
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-03-08
Phil Hord
rerere
:
Document 'rerere remaining'
Signed-off-by:
Phil Hord
<phil.hord@gmail.com>
commit
|
commitdiff
|
tree
2012-02-22
Phil Ho
r
d
cherr
y
-p
i
ck: No advice to commit if
-
-
n
o-commit
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Hord
Add test showing
git-fetch gr
o
ks
gitfi
l
es
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Ph
i
l Hor
d
Teach transport about the gitfil
e
mechani
s
m
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Hord
Learn t
o
handle git
f
i
l
es i
n
e
nter_r
e
po
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree