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 'mm/pull-upload-pack'
2015-08-05
P
a
u
l
Tan
builtin-am:
re
m
ove redirectio
n
to git-am
.
sh
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
builtin-
a
m: check for valid committer ident
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul
Tan
bui
l
t
i
n-am: i
m
plemen
t
legacy -b/--bi
n
ary
opt
i
o
n
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: impleme
n
t -
i
/--interact
i
ve
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: suppo
r
t and auto-detect mercurial pat
c
hes
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul
Ta
n
built
i
n-am:
s
upport and auto-de
t
ect
StGi
t
series files
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builtin-am
:
support and auto-detec
t
StGit patches
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am
:
rerere
s
upport
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
builti
n
-am
:
invoke post-applypatch
hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin
-
am: invoke
p
re
-
applypatch hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul T
a
n
b
ui
l
tin-am: invoke ap
p
lypa
t
c
h
-
ms
g
hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-
a
m
: support automatic not
e
s cop
y
in
g
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
built
i
n-am: invoke po
s
t-r
e
write hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
bui
l
tin-am: implement -S/--gpg-si
g
n, commit
.
g
p
g
si
g
n
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
buil
t
in-am: implement --committer-
d
ate-
i
s-author-date
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implemen
t
--i
g
nore
-
date
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
built
i
n
-am: p
a
ss
g
it-apply
'
s
options to
git
-
app
l
y
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
bu
i
ltin
-
am: implement --[no-]scissor
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
buil
t
in-am
:
s
upport --keep-cr
,
am
.
keepcr
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin-am: implement --
[
no-]message-id, am
.
messageid
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin
-
am: implement -k
/
--keep,
-
-keep-non-pat
c
h
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Ta
n
builtin-am: implem
e
nt
-
u/--utf8
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
builtin-am:
handle stray state directory
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin-am: bypass g
i
t-mailinfo whe
n
-
-
rebas
i
ng
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l Tan
builtin-am: imple
m
ent
--r
e
basing mode
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uilt
i
n
-am
:
imp
l
ement
-
-3
w
ay
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
cache-t
r
ee: i
n
troduce write_index
_
as_tree()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l
Ta
n
builtin-am: implement -s/--s
i
gnoff
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin-am
:
exit with
user
f
riendly message on failur
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
b
uiltin-am: imp
l
em
e
nt -q/-
-
quiet
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Ta
n
b
u
i
l
tin-am: reject
pat
c
h
e
s when there'
s
a s
e
ssion in
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
b
u
il
t
i
n-am
:
implement
--abort
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-a
m
: implement --sk
i
p
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
bu
i
ltin-am: don't pa
r
s
e mail
w
h
e
n resuming
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
bui
l
t
i
n-am: implement --res
o
lved
/
--co
n
t
i
nue
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
buil
t
in-am:
refuse to
appl
y
patches
i
f
i
n
d
ex is dirty
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
ltin-am: implement
c
ommit
t
i
ng applied patch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builtin-am:
a
pply
patch
w
ith git-
a
pp
l
y
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
bui
l
tin-
a
m: extract
p
atch
a
nd
com
m
i
t
info with git
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
buil
t
in-am: auto-detect mbox
patches
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l
Tan
bu
i
lt
i
n-am: s
p
l
it ou
t
m
box/maildir
p
a
tches with git
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builti
n
-
a
m: implem
e
nt p
a
tch
q
ueue mech
a
nism
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l
T
an
builtin-am
:
imple
m
en
t
skeletal
builtin am
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
wrapper: implement xfopen(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
w
r
a
pper: implement xopen()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Ta
n
t3901:
t
est
g
i
t-
a
m e
n
codin
g
conv
e
rsion
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t3418: no
n
-
i
nteractive reb
a
se --continue
w
i
th rerere
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul T
a
n
t4150: tests for am --[no
-
]scissors
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: a
m
with
post-applypatch ho
o
k
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
a
ul Tan
t
4150: am with pre-
a
pplypatc
h
h
o
ok
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
aul Tan
t4150: am wi
t
h
a
p
plypatc
h
-
m
sg
h
o
ok
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
4
150: a
m
--resolved
fails if index has unmerged entries
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t415
0
:
am
--resolv
e
d fails if index has no cha
n
ges
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am r
e
f
uses patch
e
s when
p
a
used
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4151
:
am --abo
r
t
will k
e
e
p
dirty in
d
ex intact
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am fails if index
i
s dirty
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-07
Paul Tan
t41
5
0:
a
m
.
messageid really
a
d
ds
the message id
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
u
ll: remove redirection to
git-pull
.
sh
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull -
-
rebase:
e
r
ror on no mer
g
e c
a
ndid
a
te cas
e
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
ull --reb
a
s
e: exit early w
h
en the working direc
t
o
ry
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: configure
--reba
s
e
via branch
.
<n
a
me>
.
reba
s
e or
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pu
l
l: t
e
ach
git pull about --rebase
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
u
ll: set reflog m
e
ss
a
ge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: implement pulling into an
u
n
born branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
P
au
l
Tan
pull: fast-fo
r
ward w
o
rk
i
ng
tree if head is update
d
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: check if in unresolv
e
d mer
g
e st
a
te
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul
T
an
pull: supp
o
r
t pull
.
f
f config
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pu
l
l: error on
n
o mer
g
e candidat
e
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Pa
u
l T
a
n
pull: pass git-fetch's options to git-fe
t
ch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul T
a
n
pull:
pass git-mer
g
e's options to git-me
r
ge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Ta
n
pull: pa
s
s ve
r
bosity, --
p
r
ogress
f
l
a
g
s
to fetch and
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
p
u
ll: implement fetch +
merge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul
T
an
p
u
ll: implement sk
e
letal builtin p
u
l
l
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
argv
-
arra
y
: implement ar
g
v_array_pushv()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul
T
an
pars
e
-options
-
cb
:
imple
m
ent
p
arse_opt_pas
s
t
h
r
u
_ar
g
v()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul T
a
n
parse-op
t
ions-cb:
i
mplement parse
_
opt_passthru()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Ta
n
a
m
: teac
h
mercurial pat
c
h parser how to read from s
t
din
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul
Tan
am: use gmtime() to par
s
e mercuri
a
l
patch date
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
t4150:
t
e
st
a
p
ply
i
n
g
StGit series
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
am: teach StGit
patch
p
a
rser how to read from stdin
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-12
P
a
ul Tan
t030
2
: "u
n
re
a
d
able" test needs SA
N
ITY
prereq
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am
-
-
a
bort
:
ke
e
p
u
nre
l
ated commi
t
s on unborn b
r
anch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
P
a
ul Tan
am -
-
abort:
s
up
p
ort aborting to unborn branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am
--abor
t
: rev
e
rt change
s
introduced by failed 3way
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Pau
l
Tan
am
--skip: support s
k
ipping while on unborn branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am -3:
su
p
por
t
3way merge o
n
u
nborn branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
P
a
u
l
T
a
n
am --skip: revert chan
g
es introduc
e
d b
y
fa
i
led 3way
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Pau
l
Tan
t4150: test applying
S
t
Git patc
h
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pu
l
l
:
use g
i
t
-
r
ev-pars
e
--p
a
r
s
eopt f
o
r option p
a
rsing
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pull: handle
git-fet
c
h's
optio
n
s as we
l
l
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t
5
5
20: check reflog
actio
n
in fast-for
w
ard merge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5521: test --dry
-
run
d
oes not make any cha
n
ges
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
P
a
ul Tan
t552
0
: test --rebase failure on unborn branch with
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
P
aul Tan
t5520: test --re
b
ase wit
h
mu
l
tiple br
a
nches
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5
5
20: test w
o
rk tr
e
e
fast-forward
when fetch updates
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520:
test
f
o
r fa
i
lure
i
f
i
n
dex h
a
s unresolved
en
t
ries
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Pau
l
Tan
pul
l
: parse pull
.
ff
a
s a
b
o
ol or
string
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
P
aul Tan
pull
:
m
ake pull
.
ff=true
o
verride
m
erge
.
ff
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Ta
n
pull: handle --log=<n>
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
t5520: tes
t
n
o merge candidates
c
a
ses
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
next