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
Merge branch 'sg/t3020-typofix'
2015-08-19
Pa
u
l T
a
n
am
-
-skip/--abort
:
merge HE
A
D/ORIG_H
E
AD tree
i
nto in
d
ex
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-12
Paul Tan
am: let --signoff override --no
-
sig
n
off
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-12
Paul Tan
a
m: let
c
ommand-lin
e
options override s
a
v
e
d op
t
io
n
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-12
Paul Tan
test_terminal: redirec
t
child process'
stdin t
o
a
pty
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin-a
m
:
remove redire
c
tion to git
-
am
.
sh
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builti
n
-a
m
: check fo
r
valid
c
omm
i
t
t
e
r
ide
n
t
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin-am: implement legacy -b/--binary option
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
builtin
-
am: i
m
plement -i/--in
t
eracti
v
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: supp
o
rt
and auto-detect
m
ercurial
p
atches
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
a
n
builtin-am: suppo
r
t and a
u
to-detect StGi
t
series fil
e
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: support
a
nd auto-det
e
ct
StGit
p
atches
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builti
n
-am:
r
erere support
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
a
n
bui
l
t
i
n
-a
m
: i
n
voke p
o
s
t
-applypatch hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: invoke pre-a
p
plypatch hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
T
a
n
b
u
iltin-am:
i
nvoke apply
p
at
c
h-msg hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-am: supp
o
rt a
u
tomatic n
o
t
es c
o
pying
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am
:
invok
e
p
o
st-rewrite hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am
:
impleme
n
t -S/--gpg-sign, comm
i
t
.
gpgs
i
gn
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin-am: im
p
lement --
c
ommi
t
ter-date-is-au
t
h
or-d
a
te
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uiltin-am: impl
e
m
e
n
t
-
-
i
g
nore-dat
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin
-
am: pass git-appl
y
's options
to
git-ap
p
ly
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am:
implemen
t
--[n
o
-]sci
s
sors
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: support --keep-cr, am
.
keepcr
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: imple
m
ent --[
n
o-]
m
es
s
age-id, am
.
messageid
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
builti
n
-am:
implement
-k
/
--
k
ee
p
,
-
-keep-no
n
-
p
at
c
h
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
bui
l
tin-am: imp
l
ement -u/--utf8
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builtin-a
m
: hand
l
e stray state dire
c
tory
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: bypass git-mailinfo when --rebasing
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement --rebas
i
ng
m
ode
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builtin-am:
i
m
plement --3
w
ay
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul
T
an
cache-tr
e
e: int
r
oduc
e
write
_
index_
a
s
_tree()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
b
u
i
ltin-am:
implement -s/--signoff
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uiltin-
a
m: exit with user f
r
ie
n
dly message
on fai
l
ure
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
builtin
-
am: imp
l
ement
-
q/--quiet
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
iltin-am: re
j
e
c
t patches when there's a ses
s
ion in
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul T
a
n
b
uiltin-am: implemen
t
--abort
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
buil
t
in-am: implement --skip
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
builtin-am: d
o
n
'
t par
s
e mai
l
when res
u
ming
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul
Tan
b
ui
l
tin-am: imple
m
e
nt -
-
resolved
/
--continue
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am:
refuse to appl
y
p
a
t
ches if index is dirty
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
builtin-am: implemen
t
committing applied patch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l Ta
n
builtin-am: apply p
a
tch with g
i
t-apply
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Ta
n
built
i
n-am: extract patch and commit inf
o
with git
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builti
n
-a
m
:
a
uto-dete
c
t mbox patches
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
bu
i
l
t
in-am:
s
pli
t
out mbox/maildir pat
c
hes wi
t
h
git
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l
T
a
n
b
uiltin-
a
m: imple
m
ent patch qu
e
ue
m
echanism
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
builtin-am: implement skeletal builtin am
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
wrapper
:
implement xfope
n
()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
wrapper: im
p
le
m
ent xopen()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
390
1
: t
e
st g
i
t-am encoding conver
s
i
o
n
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t341
8
: non-in
t
eractive rebase --continue with r
e
r
ere
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
aul Ta
n
t4150: tests for am
-
-[n
o
-]s
c
issors
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
a
ul Tan
t415
0
:
a
m
with
p
ost-applypatch h
o
ok
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul T
a
n
t4150:
a
m wi
t
h
p
re-applypatch hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150:
a
m
w
ith ap
p
lypatch-msg
h
o
ok
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Ta
n
t4
1
50: am --r
e
solv
e
d fails if ind
e
x
h
as
u
nmerged entries
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: a
m
-
-resolved fail
s
if
i
n
d
ex has
n
o c
h
anges
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am refuses
patches
wh
e
n paused
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4151: am
--abort
will keep
dir
t
y index intact
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
a
ul Tan
t4150: am
fails i
f
index
is
dirty
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-07
Paul Tan
t4150: am
.
message
i
d really adds the messag
e
i
d
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
P
a
u
l
T
an
p
u
ll: remove redir
e
ctio
n
to git-pull
.
sh
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
u
l
l -
-
r
e
bas
e
: error
o
n
no merge candid
a
te cases
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul T
a
n
pull
-
-
r
ebase: exit early when
the
wo
r
king directory
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Pa
u
l T
a
n
pull: co
n
f
i
g
u
r
e
--rebase vi
a
branch
.
<name
>
.
rebase
o
r
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Ta
n
pu
l
l
:
t
ea
c
h git
p
ull about --reb
a
se
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
P
a
u
l
Tan
pull: set ref
l
og me
s
s
age
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
ull: imp
l
ement pulling into an unborn branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul T
a
n
pull: fast-f
o
rward
wor
k
i
ng tree if
head is upda
t
e
d
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul
T
an
pull: chec
k
if in unreso
l
ved merge s
t
ate
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
P
a
ul Tan
pull: s
u
pport pull
.
ff config
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: error on no merg
e
ca
n
didates
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: pass git-fe
t
ch's o
p
tions
to git-fe
t
ch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
P
a
ul Tan
pul
l
: pass git-merge's opt
i
ons to git-m
e
rge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Ta
n
pul
l
: p
a
ss verb
o
sity, --progress flags to
f
etch a
n
d
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
P
a
ul T
a
n
pull: im
p
lement
f
e
tch + merge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull: impl
e
me
n
t skel
e
tal
b
u
iltin pull
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l Tan
argv-ar
r
ay: implement argv_ar
r
ay_pushv()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
p
a
rse-
o
pt
i
ons-cb
:
implem
e
n
t
pars
e
_opt_passthru_argv()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
parse-options-cb: imple
m
ent
parse_op
t
_
p
a
ssthru(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
Tan
am: teach mer
c
urial patc
h
parser
h
ow to read fro
m
stdin
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
am
:
use gmt
i
me() to pa
r
se mercu
r
ial patch date
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
t4150:
t
est applying StGit serie
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
P
a
ul Tan
am: teach
StGit patch par
s
er
how t
o
read from stdin
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-12
Paul Tan
t030
2
: "unreadable"
t
e
st needs SA
N
I
T
Y prereq
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am
--ab
o
r
t: keep unr
e
lated com
m
its on unborn
b
ranc
h
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Pa
u
l Tan
am -
-
abor
t
:
s
uppor
t
aborting to
u
nborn branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am --abort: r
e
v
e
r
t
ch
a
n
g
es in
t
r
o
du
c
ed by failed 3way
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Pa
u
l T
a
n
a
m -
-
sk
i
p
:
s
u
pp
o
rt skipping whil
e
on unborn branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Pau
l
Ta
n
am -3:
su
p
port
3way
m
er
g
e on unborn branc
h
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul
Tan
am --skip: re
v
e
r
t changes introduced by failed 3way
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Pa
u
l Tan
t
4150: test
a
p
plying
S
tGit
p
a
t
ch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pu
l
l:
use git-rev
-
parse
-
-p
a
r
seopt for option par
s
ing
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pull: handl
e
git-fetc
h
's
op
t
ions as well
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t
5520: check ref
l
og action in fast-forward merge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5521: test -
-
dry-
r
un do
e
s no
t
make a
n
y
chan
g
e
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t55
2
0:
test --rebase
f
ailure on
u
nborn bra
n
c
h
with
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l
Tan
t5520: test --reba
s
e
w
ith multiple bran
c
hes
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5
5
20: t
e
st work tree fas
t
-forw
a
rd when fetch upd
a
tes
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: test for failure if inde
x
ha
s
unreso
l
ved e
n
tries
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
next