repo.or.cz
/
alt-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 'rh/merge-options-doc-fix' into maint
2013-05-28
Ph
i
l Hord
t
ri
v
ial: Add
m
i
ssing p
e
riod in documentation
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2013-04-23
Phil Hord
rebas
e
: find orig_head unam
b
iguously
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2013-03-13
P
hi
l
Hord
t
a
g: --force does
not have to war
n
when creating tags
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2013-01-14
Phil Hord
rebase --preserve-merges: keep all
merge commits including
.
.
.
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
P
hil Hord
Add tests fo
r
subm
o
dule
s
y
n
c --recursive
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phi
l
Hord
T
e
ach --recursive
to
submodule sync
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil H
o
rd
t740
7
:
Fix r
e
cursive submodule test
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-25
P
h
il Ho
r
d
git-pull:
A
v
oid merge-base on d
e
tached h
e
ad
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Ph
i
l H
o
rd
s
t
a
sh: invoke rerere in case of conflict
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil
Hord
test: git-stash conflict
set
s
up rer
e
re
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-03-08
Phil H
o
rd
rerere: Do
c
ume
n
t 're
r
ere remaining'
Signed-off-by:
Phil Hord
<phil.hord@gmail.com>
commit
|
commitdiff
|
tree
2012-02-22
Phil Hord
c
h
erry
-
p
i
c
k
: N
o
ad
v
ice
t
o commit if --
n
o-commit
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Ph
i
l Hord
A
d
d te
s
t showing git-fetc
h
gro
k
s
gitf
i
les
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil
H
ord
Teach tr
a
nsport
a
b
o
u
t the gitfile mech
a
ni
s
m
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Hord
L
earn to handle gitfiles in enter_repo
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree