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 -i/--interactive
2015-08-05
Paul Tan
built
i
n
-
am: imple
m
ent -i/--interactive
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
builtin-am: support and auto-detect me
r
curial p
a
tches
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
i
l
t
i
n-
a
m
: su
p
por
t
and auto
-
dete
c
t StGit series files
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
builtin-am
:
support and
auto-detect
S
tG
i
t
patche
s
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
a
n
builtin
-
a
m: rerere support
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
T
an
buil
t
in-am:
i
n
vok
e
post-applypatch hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Ta
n
builtin-am: invo
k
e
pr
e
-applypatch hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
b
u
i
ltin-am:
invoke applypatc
h
-ms
g
h
ook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul
Tan
builtin-am:
support
a
utomat
i
c notes copying
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
iltin-a
m
:
invoke post-
r
ewrite hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: imple
m
ent -S/
-
-gpg-sign,
c
ommit
.
gpg
s
ign
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am:
i
mplement --commit
t
er-da
t
e-is
-
aut
h
o
r
-
d
ate
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am:
im
p
lement --ign
o
r
e
-d
a
te
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
builtin-am:
p
ass git-apply's o
p
tions t
o
git-apply
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
b
uiltin-am: imple
m
ent
-
-[
n
o-]s
c
issors
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
l
t
i
n
-
am: su
p
p
o
rt -
-
keep-cr, am
.
kee
p
c
r
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l T
a
n
bui
l
tin-
a
m: im
p
le
m
e
nt --[no-]m
e
ssage-id, am
.
me
s
s
age
i
d
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: im
p
le
m
en
t
-k/--keep, -
-
k
e
e
p
-non-patch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
a
n
b
u
iltin-am: imple
m
ent -u/--utf8
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: handle stray sta
t
e dir
e
ct
o
ry
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: bypass git-mailin
f
o when
--rebasing
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
ilti
n
-am: implement --rebasin
g
mode
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: i
m
plement --3wa
y
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
ca
c
he-tree:
introdu
c
e wri
t
e_index_as_
t
ree()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
i
l
tin
-
am:
i
m
plement -s/--s
i
gnoff
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: exit with us
e
r
f
riendly m
e
ssage on failure
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul
T
an
builtin-am: implement -q/-
-
quiet
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul
Tan
bui
l
tin-am: reject patch
e
s when th
e
re's a sess
i
on
i
n
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
i
l
tin-am: implement -
-
abo
r
t
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
buil
t
in-am: implem
e
nt --skip
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
builtin
-
am:
don't pa
r
s
e
mail when
resuming
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
builtin
-
am:
implement --resolved/--c
o
n
tinue
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin
-
am: refuse to apply patches if index is di
r
ty
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
builtin
-
am: i
m
pl
e
m
ent commi
t
ting applie
d
patc
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
buil
t
in-am: appl
y
patch
w
ith g
i
t-
a
pply
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
builtin-am:
e
xtract pa
t
c
h
and commit info with git
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
au
l
Tan
bu
i
ltin-am:
auto-detect mbox patches
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: split o
u
t mbox/ma
i
l
d
ir
p
atches
w
i
th git
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uilt
i
n-am:
implement patc
h
queue me
c
hanis
m
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
b
uiltin-
a
m
:
i
m
pleme
n
t skeleta
l
builti
n
am
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
w
r
apper: impleme
n
t xf
o
pen
(
)
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
wrapper: implement xop
e
n()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
3
901:
t
est gi
t
-am
encoding conversion
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t34
1
8: non-interactive rebase --continue with rerere
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: tests for
a
m --[no-]s
c
i
ssors
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
4150
:
am
with post-applypat
c
h hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am with p
r
e-applypatch hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul T
a
n
t41
5
0: a
m
with applypatch-m
s
g ho
o
k
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am --resolved fails if inde
x
has
unmer
g
ed ent
r
ies
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul
Tan
t41
5
0: am --resolve
d
fails
i
f
i
ndex h
a
s
no chan
g
es
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul 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
wil
l
keep dirty index
in
t
act
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t41
5
0: a
m
fails if index i
s
dirty
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-07
P
a
u
l Tan
t4150: a
m
.
m
e
ssageid really adds
t
he me
s
sage id
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
P
aul
T
an
pull: remove
re
d
ir
e
ction to g
i
t-pull
.
sh
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul
T
an
pull --rebase: error on no merge candidate cases
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul
T
an
pull --rebase: exit ear
l
y when th
e
working directory
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: configure --r
e
base v
i
a branch
.
<
n
ame>
.
rebase or
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull:
teach git
pull a
b
out -
-
reb
a
se
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: set
re
f
log
me
s
sage
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul
Tan
pull: i
m
p
lement p
u
lling into a
n
unborn
branch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
P
a
ul T
a
n
pull: fast-forward
wor
k
in
g
t
r
ee if h
e
ad is upd
a
ted
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pu
l
l: check if
i
n
u
n
r
esolved merge
s
tate
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Pau
l
T
a
n
pull: s
u
p
port pull
.
ff config
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
ull:
error
o
n n
o
merge candi
d
ates
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul
T
a
n
p
u
ll: pass
git-fetch's options
t
o
g
i
t-
f
etch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul
Tan
pull: pass git-
m
erge's o
p
tions to git-merge
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
P
a
ul Tan
pull: pass verbosity,
-
-
pr
o
gress
flags to fe
t
ch an
d
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pul
l
: implement fetch + mer
g
e
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull:
i
mplement skeletal builtin pu
l
l
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Ta
n
ar
g
v-array:
i
mplement
argv
_
a
r
ray_
p
u
shv()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
P
aul Tan
parse-options-cb: impl
e
ment
p
a
r
se_opt_pa
s
sthru_argv()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
P
a
u
l
Tan
p
arse-options
-
cb: im
p
lement parse
_
opt_passt
h
ru()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul
T
an
am: t
e
a
ch mercurial patch parser
h
o
w
to read from stdin
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul
Tan
am: use gmt
i
m
e() to parse
m
e
rcurial
p
atch date
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
t
4
1
50: test applying
StGit se
r
ies
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul T
a
n
am: teach StGit
patch
p
arser ho
w
to read fr
o
m stdin
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-12
Pa
u
l T
a
n
t0302:
"unread
a
b
l
e" test needs SANITY prereq
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul T
a
n
am --abort
:
keep
u
nrelated c
o
mmi
t
s
o
n unbo
r
n branch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am --abor
t
: support
a
borting to
unborn br
a
n
ch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Pau
l
Tan
am --abort:
r
e
v
e
rt changes intr
o
duced by failed 3way
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul T
a
n
am --s
k
ip: support s
k
ipping whi
l
e on unborn
b
ranc
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am -3: support 3
w
a
y
merge
o
n unbo
r
n bran
c
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Pau
l
T
an
am -
-
skip:
revert changes in
t
r
oduced by fa
i
led 3way
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul
Tan
t4150: test a
p
plying St
G
it patc
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
p
ull: use
g
i
t
-re
v
-
pa
r
se --par
s
eo
p
t for option parsing
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pull: handle
git-fet
c
h's options as well
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520:
c
heck reflog a
c
tion in fast-for
w
a
r
d merge
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5521: test
--dry-
r
un does not make any changes
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l Tan
t5520: test
-
-rebase failur
e
on unb
o
rn b
r
anch with
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5
5
20: te
s
t --r
e
b
as
e
wi
t
h
m
u
l
tiple branch
e
s
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: test
wo
r
k tr
e
e
fas
t
-forw
a
rd
w
hen fetch updates
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Pau
l
Ta
n
t5520
:
test fo
r
failure if index
has
unre
s
olved e
n
tri
e
s
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull
:
pa
r
se pull
.
ff a
s
a
bo
o
l
or strin
g
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull: make pull
.
ff=true override
m
e
r
ge
.
ff
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
P
a
ul Ta
n
pull:
h
and
l
e --log=<
n
>
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
P
aul
T
an
t5
5
20: t
e
st
no m
e
rge candidates cases
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
P
a
ul Tan
t55
2
0: prevent field splitting in content comparis
o
ns
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-14
Paul
T
an
pull:
remove --tags error in no merge c
a
n
d
idates c
a
s
e
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
P
a
ul Tan
path
.
c
: remo
v
e home_config_paths()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
next