repo.or.cz
/
git
/
git-svn.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 -i/--interactive
2015-08-05
P
aul Tan
builtin-am:
i
m
plement -i/-
-
in
t
eractive
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bui
l
tin-am: suppor
t
a
nd au
t
o-detect
m
ercurial patc
h
e
s
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-
a
m: support and a
u
t
o-det
e
ct StGit
s
eries
f
iles
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
b
uilti
n
-am: support and auto-d
e
tect StGit patches
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
bui
l
t
i
n-am
:
r
e
rere support
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
b
u
ilt
i
n-a
m
: in
v
oke
post-applypa
t
ch ho
o
k
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am:
invoke pre-applypa
t
ch hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
a
n
builtin-am: invoke applypatch-msg hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builtin
-
am: support au
t
o
mat
i
c notes copying
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-am:
invoke p
o
st-rewrit
e
hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
b
uiltin
-
am: imp
l
e
m
en
t
-S
/
--gpg-sign, co
m
m
i
t
.
gpgsi
g
n
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
buil
t
in-am
:
imp
l
em
e
nt
-
-
co
m
m
itter-date-i
s
-author
-
da
t
e
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
built
i
n
-
am: imp
l
e
ment --ignore-date
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: pass git-apply's options to
g
it-apply
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
b
uiltin-am: impl
e
me
n
t --[no-]s
c
issors
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
bui
l
t
in-am: support
--keep-c
r
, am
.
keep
c
r
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
builtin-
a
m: implement --[no-]message-id, am
.
messageid
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builtin-a
m
: impl
e
ment
-
k/--ke
e
p, --keep-non-pa
t
ch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l T
a
n
builtin-am: imp
l
e
m
ent -
u
/
-
-u
t
f8
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
bu
i
ltin-am: han
d
le stray st
a
te
d
i
rect
o
ry
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
buil
t
in
-
am: bypas
s
git-m
a
ili
n
fo when -
-
rebasi
n
g
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
b
uil
t
in-am: implement --rebasi
n
g
mode
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin-
a
m
:
imple
m
ent --3way
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
c
a
che-
t
ree: introduc
e
wri
t
e_ind
e
x_as_tree(
)
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l
T
an
bui
l
t
in-am: i
m
plement -s/--s
i
gnoff
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
i
ltin-am: exit wi
t
h
user friendly message on failure
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
builtin-am: imp
l
ement -q
/
--quiet
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
buil
t
i
n-am: rej
e
ct patches when there's a session in
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
b
u
iltin-am: imp
l
eme
n
t --abort
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
buil
t
in-am
:
implement --ski
p
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l Tan
builtin-am: don'
t
p
ar
s
e ma
i
l when resuming
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin-am:
imp
l
ement --resolve
d
/--continue
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
bui
l
tin-am:
r
efuse to ap
p
ly patches if
index is dirty
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l
T
an
builtin
-
am: imp
l
ement
committi
n
g a
p
plied patch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
builtin-am: app
l
y
p
atch with gi
t
-apply
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul T
a
n
builtin-am: ext
r
act patch and commit info
w
ith git
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builtin-am:
a
u
t
o-de
t
ec
t
mbox
patches
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
b
uiltin
-
am
:
split
o
ut
mbox/maildir patches with git
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-a
m
: implement pat
c
h queue mecha
n
ism
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
i
l
tin-am: implement skeletal builtin am
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
wrapper: imp
l
e
ment
x
fop
e
n
(
)
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Ta
n
wrapper: im
p
l
e
ment xo
p
en()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t3901:
t
est git
-
am encoding co
n
v
e
r
sion
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
P
a
u
l Tan
t3418: no
n
-intera
c
tive rebase
-
-conti
n
ue with rerere
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
P
a
ul Tan
t4150: tests for am --[no-]sci
s
sors
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul
Ta
n
t4150: am with
p
o
st-a
p
p
l
ypatch
h
ook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Pau
l
Tan
t
4
1
5
0: am w
i
th pre-a
p
p
lypatch hoo
k
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am with applyp
a
tc
h
-msg hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l Tan
t
4150
:
am --resolv
e
d
fails if index has unmerg
e
d entries
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am -
-
resolved fail
s
if in
d
ex
has no changes
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
P
aul Tan
t4150: am refuses patches when paused
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul
Tan
t4151
:
am --abort will ke
e
p
d
i
rty index
i
ntact
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am fai
l
s i
f
index i
s
dir
t
y
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-07
Paul Tan
t
4
150:
a
m
.
m
e
ssageid really adds the message i
d
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pul
l
: r
e
move redirection to git-pull
.
sh
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pul
l
--rebase:
e
rro
r
on n
o
merge
c
andidate cases
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul
Tan
pull --reba
s
e: exit early wh
e
n
t
h
e worki
n
g directory
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: configu
r
e --rebase
v
ia branch
.
<
name>
.
rebase o
r
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
P
a
u
l
Tan
pu
l
l: te
a
ch git pu
l
l
about --rebas
e
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
Paul Tan
pull
:
implement
pulling into
a
n un
b
o
r
n
branch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull:
fast-f
o
rw
a
r
d wo
r
king tree
i
f head is u
p
d
a
t
e
d
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull:
check if in unresolved merge state
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Pa
u
l
Tan
pull: sup
p
o
rt pull
.
ff c
o
nf
i
g
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Ta
n
pull
:
error on no merge ca
n
didates
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
ull: p
a
ss git-fetch's o
p
tions t
o
g
it-fet
c
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull: pa
s
s
g
it
-
merge's
options
to
git-merg
e
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
P
a
ul Tan
pull: pas
s
verb
o
sity, --progress flags to fetc
h
and
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
p
ull: i
m
ple
m
ent fetc
h
+ m
e
r
ge
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
T
a
n
pull:
imple
m
ent skeletal builtin
p
ul
l
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul
Tan
argv-arr
a
y: implement ar
g
v
_
array_pushv()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pars
e
-options-cb: imple
m
e
nt pa
r
se_o
p
t
_passthru_argv
(
)
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Ta
n
parse-opt
i
ons-cb: implement
parse_op
t
_
pa
s
s
t
hru()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
Tan
am: tea
c
h merc
u
rial pa
t
ch
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
g
mtime()
to parse
mercurial pat
c
h date
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul
Ta
n
t4150: test a
p
plyi
n
g S
t
Git series
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Ta
n
am: te
a
ch S
t
G
it pat
c
h parse
r
how to read
from std
i
n
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-12
P
a
u
l
Ta
n
t03
0
2: "
u
n
r
eadable" t
e
st needs SANITY prereq
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
P
aul Tan
am
--abort: k
e
ep
u
nrela
t
ed com
m
its on unb
o
r
n branch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
P
a
ul Tan
am --ab
o
rt: support
abor
t
in
g
to
u
nborn branch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul
Tan
am --abort: revert changes int
r
oduce
d
by f
a
iled 3way
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am
--skip: support skipping while on u
n
born branch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
P
aul Tan
am -
3
:
support 3
w
ay
m
e
r
ge on
u
nborn
branch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
a
m --
s
k
i
p
: revert cha
n
ges introduced
by
f
ailed 3way
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
t4150: test
a
pp
l
ying
StGit patch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pu
l
l
:
use git-rev
-
pars
e
--parseopt for
o
p
t
ion pars
i
ng
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-02
Pa
u
l Tan
pull:
h
andle gi
t
-fetch's optio
n
s as well
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: che
c
k refl
o
g action in fast-forwa
r
d merg
e
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l Tan
t
55
2
1: test --dry-run
d
o
e
s
n
o
t make any chan
g
es
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l Tan
t
5
520: test --rebas
e
failure
o
n u
n
born
branch with
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: test --rebase with multi
p
le branches
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: test work tree fast
-
forward whe
n
fetch
updates
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: tes
t
for fai
l
ure if index h
a
s u
n
re
s
ol
v
ed entr
i
e
s
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Ta
n
pull
:
pa
r
se p
u
l
l
.
f
f
as a bool
o
r strin
g
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
p
ull
:
make
p
ull
.
ff=true ove
r
r
ide merge
.
f
f
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Pau
l
Tan
pull:
handl
e
--log=<n>
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
t5520: test no m
e
r
ge candi
d
ates cases
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Pau
l
Tan
t5520: p
r
event field splitting in content com
p
arisons
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-14
Paul Tan
pul
l
: remove --t
a
gs erro
r
in
no
m
erge c
a
ndid
a
tes
c
ase
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
path
.
c: remove home_config_path
s
()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
next