repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
builtin-am: implement legacy -b/--binary option
2015-08-05
Paul
T
a
n
builtin-am: implement legac
y
-
b
/--bi
n
ary o
p
tion
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am:
i
mp
l
e
m
ent -i/--int
e
ract
i
ve
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
built
i
n-am: support and auto-detect m
e
rc
u
rial patches
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
l
t
in-am: support and auto-detect StGi
t
series
f
iles
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: support and
a
ut
o
-detect StGit patc
h
es
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
bui
l
tin-am: rerere support
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am:
i
nvoke po
s
t-app
l
yp
a
tch hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: invoke pre-
a
pplypatch hoo
k
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
builtin-am
:
invoke applyp
a
tch-msg hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-am: s
u
pport aut
o
m
atic notes copying
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
l
t
in-am: in
v
oke post-rewrite h
o
ok
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l
Tan
builtin-
a
m: impleme
n
t -S/--g
p
g-sign, commit
.
gpgsi
g
n
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
buil
t
in-a
m
: implement --committer-date-is-auth
o
r-date
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am:
i
mplement --ignore
-
date
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
b
u
iltin-
a
m: pas
s
git-apply
'
s
opti
o
n
s to git-apply
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
builtin-am
:
implement --[no-]scissor
s
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
buil
t
in-am: s
u
pport
--kee
p
-cr, am
.
keepc
r
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
bu
i
l
t
in-am: implemen
t
--[
n
o-
]
message-id, am
.
mess
a
g
e
id
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uiltin-am: implement
-
k
/--keep, --k
e
ep-non-patc
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builtin-am: i
m
pl
e
ment -
u
/-
-
utf8
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
a
n
bu
i
lt
i
n-
a
m: handle stray st
a
te di
r
ecto
r
y
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builti
n
-am: by
p
ass git-mailinfo
w
h
e
n
-
-rebasing
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: im
p
le
m
ent
-
-rebas
i
ng mod
e
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul
T
an
b
uiltin-a
m
: impleme
n
t --3
w
ay
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
c
a
che-tree: in
t
roduce write_index_as_tr
e
e
(
)
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uiltin-am: i
m
plem
e
nt
-s/--signoff
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
builtin-am:
e
xit with user friendly
mes
s
age on failure
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implem
e
n
t -q/-
-
quie
t
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-a
m
:
rejec
t
patches
when there
'
s a se
s
sion in
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
il
t
in-am: i
m
pl
e
me
n
t --a
b
ort
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
buil
t
in-am: implement -
-
s
k
ip
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l
T
a
n
buil
t
in
-
am: d
o
n't parse ma
i
l when resuming
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uiltin-am: im
p
lem
e
nt
-
-re
s
olved/
-
-
c
o
n
t
i
nue
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
a
n
bu
i
ltin
-
am:
refuse to apply
p
atches if inde
x
is dirty
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
T
a
n
b
u
iltin-am: imple
m
ent committing applied pa
t
ch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
bu
i
ltin-a
m
: appl
y
p
atch wit
h
git-
a
pply
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
bui
l
tin-am
:
ex
t
ract pa
t
ch
a
nd com
m
it
i
n
f
o w
i
th git
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: a
u
to
-
de
t
ect mbox patches
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
builtin-am: s
p
lit out mbox/maildir pat
c
he
s
with git
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
bui
l
tin
-
am: i
m
plemen
t
p
a
tch queue mechanis
m
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
b
uiltin-am: impl
e
m
e
nt sk
e
letal builtin am
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
wrapp
e
r
:
implem
e
nt xfop
e
n()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
wra
p
per: implement xopen()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
3
9
0
1
: test git-a
m
enc
o
ding conve
r
sion
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l Tan
t3418: non-
i
nteractive rebase --continu
e
with rerere
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
P
aul Tan
t4150:
t
ests
f
or am
-
-[no-]scissors
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
P
aul Tan
t4150: am
with post-applypatch hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t41
5
0:
a
m
with pre-
a
pplypatc
h
hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am with ap
p
ly
p
atch-msg hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
4
1
5
0: am
-
-resolved fails i
f
index has unmerged entries
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul
T
a
n
t4150:
am
-
-re
s
olved fai
l
s if index has no
c
h
a
nges
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul
T
an
t4150: am refuses patches when paused
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
P
aul Tan
t4151
:
a
m
--abort will k
e
ep
d
irty index intact
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l
T
an
t415
0
: a
m
fail
s
if
i
ndex is
d
ir
t
y
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-07
Paul Tan
t
4
150: am
.
mes
s
a
gei
d
really adds the message id
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: remo
v
e redirect
i
o
n
to git
-
pull
.
sh
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull --
r
ebase: erro
r
on n
o
me
r
ge ca
n
did
a
te c
a
ses
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
P
aul Tan
pull
-
-
r
e
ba
s
e: exit earl
y
when the workin
g
d
irector
y
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
ull: configure --r
e
base
via bra
n
c
h
.
<name>
.
rebas
e
or
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: teach git pull
a
bout --rebase
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: set
r
eflog
message
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Pau
l
T
an
pul
l
: imple
m
ent pulling into
a
n
unb
o
r
n
branch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Pa
u
l T
a
n
p
ull:
f
ast-forward
working tre
e
if head is updated
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Ta
n
pul
l
: c
h
eck if in
unresolved m
e
rge
s
t
ate
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
ull
:
su
p
port pull
.
ff config
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul
Tan
pull: error on
no me
r
ge candidates
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
P
aul Tan
pull: p
a
s
s git-fetch's options to g
i
t-fetc
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull:
pass git-merge
'
s options
t
o git-
m
erge
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
P
aul
Tan
pull: pass verb
o
sit
y
, -
-
pro
g
ress fla
g
s
t
o fetch and
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul
T
an
pull
:
implement fetc
h
+
m
erge
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
Tan
pull: implement skeletal
b
u
iltin pull
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
argv-array:
i
mp
l
e
ment arg
v
_array
_
pushv()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Ta
n
par
s
e-opti
o
ns-cb: impleme
n
t
pars
e
_opt_pa
s
sthru_argv
(
)
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Ta
n
p
a
rse-options
-
cb:
implement pars
e
_o
p
t_p
a
ssthru()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
am
:
t
each
m
er
c
urial
pa
t
ch
p
a
rser how t
o
r
ead fro
m
s
t
din
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
am: use gm
t
ime() to parse mercurial patch date
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l
Tan
t4150: test apply
i
n
g StGit series
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
am: teach S
t
Git patch pars
e
r h
o
w to read from stdin
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-12
Paul Tan
t0302: "unreadable" test needs
S
ANITY prer
e
q
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am --ab
o
rt:
keep unrelat
e
d commits
o
n unbor
n
branch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am --abort: supp
o
r
t
ab
o
rting t
o
unborn
bran
c
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
a
m
--abo
r
t
: rever
t
chan
g
es introduced by failed 3way
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Ta
n
am --skip: support skipping while on
unborn bran
c
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am
-
3
: s
u
p
port 3way
m
erg
e
o
n u
n
born branch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul T
a
n
a
m
-
-skip: revert
changes
i
ntrodu
c
ed by fa
i
led 3way
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
t
4
1
5
0: test a
p
p
lying StG
i
t pat
c
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-02
Paul T
a
n
pull:
use git-rev
-
parse --
p
arseo
p
t for option par
s
ing
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-02
P
aul Tan
pull
:
handle g
i
t-fet
c
h's op
t
ions as wel
l
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Ta
n
t5520: check reflog actio
n
i
n
fast
-
forw
a
rd merge
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l Tan
t5521: test --dry-r
u
n
d
oes not mak
e
an
y
chang
e
s
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Ta
n
t5520: te
s
t --reb
a
se
f
ailu
r
e on unborn bran
c
h wi
t
h
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: test
-
-rebase
w
i
th
m
ultiple branche
s
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Pau
l
Tan
t5520: test work tree fast-for
w
ard
w
hen f
e
t
ch updates
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Pau
l
Tan
t
5520: test for failure if
i
ndex
has u
n
resolved entries
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull
:
p
a
rse pull
.
ff as a
b
ool or string
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pu
l
l
: make
pull
.
ff=true
o
verride merge
.
f
f
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Pa
u
l
Tan
pull:
ha
n
d
l
e --log=<n>
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
P
a
ul Tan
t55
2
0: test
no merge
candidates cases
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
P
a
ul Tan
t5520: preve
n
t
f
i
eld splitting i
n
content com
p
arisons
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-14
P
a
u
l
Tan
p
ull: remove -
-
tags error in no m
e
rge candidates case
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
next