repo.or.cz
/
git.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
Pa
u
l Tan
builtin-am: im
p
lement
l
egacy -b/--binary
option
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
b
u
iltin
-
am
:
implemen
t
-i/--in
t
eracti
v
e
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builti
n
-am: suppor
t
and
a
uto-
d
etect mercurial patc
h
e
s
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin
-
am:
support
and auto-detect StGit series files
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: support and au
t
o-detect StGit pa
t
ches
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uilt
i
n-a
m
: rerere suppor
t
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin
-
am: invoke
p
ost-applypatch
h
ook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin-am: invoke pre-applypatch
h
ook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: invok
e
app
l
ypa
t
ch-msg
hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
built
i
n
-
am: support automat
i
c n
o
tes copying
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin-am
:
in
v
oke post-rewrite
h
ook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
builtin-am: implement -S
/
-
-
gpg
-
s
ign
,
commit
.
gpgsign
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
b
uiltin-
a
m: implem
e
n
t
--c
o
mmitter-dat
e
-is
-
author-date
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Ta
n
bui
l
tin-am: impl
e
men
t
--i
g
nore-dat
e
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
builtin-am: p
a
s
s
g
it-app
l
y's options
t
o git-apply
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
bui
l
t
i
n-am: implement --[
n
o-
]
scissors
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bui
l
tin
-
am: support --keep-cr,
a
m
.
keepc
r
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
buil
t
in-am:
implem
e
nt --[
n
o-]m
e
ssage-id, am
.
messageid
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l T
a
n
builtin-am:
impl
e
ment -k/--kee
p
, -
-
keep-non-patc
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
b
uilti
n
-
am: implement -u/--utf8
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
ilti
n
-
am: handle stray stat
e
d
i
rectory
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
bu
i
l
t
in-am: bypass git-mailinfo when
-
-rebasing
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
ltin-am: impl
e
ment --reb
a
s
i
ng mode
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
ltin-
a
m:
i
mpleme
n
t --3wa
y
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
cache-tree: intr
o
duce w
r
ite_index_as_tree()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
b
u
iltin-am: imple
m
en
t
-s/
-
-signo
f
f
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
ilt
i
n
-
am: exit with
u
se
r
f
r
iendly message
o
n
failure
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement -q/-
-
qui
e
t
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l T
a
n
bui
l
tin-am: reject patches when
t
h
e
re's a session
i
n
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bui
l
tin-am: implement --a
b
ort
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
bu
i
ltin-am: implemen
t
--skip
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builtin-a
m
: don
'
t parse mai
l
w
hen r
e
s
uming
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
builtin-am: i
m
plement
-
-reso
l
ved
/
--contin
u
e
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builtin-am: refuse
to appl
y
patc
h
es if index is dirty
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
b
u
iltin-am: implement committing applied pat
c
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin
-
am: apply patch with git-apply
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-a
m
:
e
x
t
r
a
ct pat
c
h and commit info with git
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
buil
t
in-am: auto-detec
t
mbox p
a
tches
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
builti
n
-am
:
split ou
t
m
box/m
a
il
d
ir patches with gi
t
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
builtin
-
am
:
i
mplement patch
que
u
e mechanism
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
bu
i
lti
n
-
a
m: impl
e
m
e
nt skelet
a
l
builtin am
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
wrapper: implement xf
o
pen()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
wrapper: implemen
t
x
o
pen()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
P
aul Tan
t3901: test git-am encoding conversio
n
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t3418: no
n
-interactiv
e
r
e
ba
s
e --continue 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
-
]s
c
isso
r
s
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am with p
o
st-applypat
c
h
hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
P
a
ul Tan
t
415
0
:
am wit
h
p
re-applyp
a
t
c
h hoo
k
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
4
150: am with
a
pplyp
a
tch
-
msg hoo
k
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Ta
n
t415
0
: am --resolved fails if index h
a
s
u
nmerged entries
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul
T
an
t4150: am --
r
esolved f
a
ils
if index has no changes
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t415
0
: a
m
r
e
fus
e
s pat
c
hes when pa
u
sed
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
P
a
ul Tan
t41
5
1
: am --ab
o
r
t
will keep dirty index i
n
tact
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am fa
i
ls if i
n
dex is dirty
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-07
Pau
l
Ta
n
t4
1
50: am
.
mes
s
age
i
d r
e
a
l
ly adds
the
message
i
d
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul
Tan
pull: remove
r
edire
c
tion to gi
t
-p
u
ll
.
s
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Ta
n
pull
--rebase: error
on no merge candidat
e
ca
s
es
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul
T
an
pul
l
--rebase: exit early
when the workin
g
dire
c
to
r
y
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull:
configur
e
--rebase via b
r
anch
.
<name>
.
re
b
ase or
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: teac
h
git pull about --rebase
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Pa
u
l Ta
n
pull:
s
e
t
reflog message
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pul
l
: im
p
leme
n
t p
u
ll
i
ng i
n
to an unborn bra
n
ch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul
Tan
p
ull:
f
ast-
f
o
r
w
ard
w
orking tree if
h
e
a
d is
u
pdated
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: chec
k
if in unresolved
me
r
ge state
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: support pull
.
ff c
o
nfig
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
P
a
ul T
a
n
pull: error on n
o
merge can
d
i
d
ate
s
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
P
aul Tan
pull: pass git-fetch's options to git-
f
etch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
p
ull: pass git-m
e
rge's
o
p
t
ions to g
i
t-merge
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
Ta
n
pul
l
:
pass verbosity, -
-
progress
f
la
g
s to f
e
t
ch and
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
p
ull
:
implement fetch
+
merge
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull:
i
m
plement skelet
a
l builti
n
pull
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul
T
an
arg
v
-array:
i
mp
l
e
ment argv_array_pushv(
)
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
p
a
r
se-opti
o
ns-cb: implement parse_opt_
p
asst
h
ru_argv()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul T
a
n
p
arse-opt
i
ons-cb: imp
l
ement
p
arse_opt_passthr
u
(
)
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
am: t
e
ach
m
ercurial
p
atch pa
r
ser how to read f
r
om st
d
i
n
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
a
m
:
use gm
t
ime() t
o
p
arse mercurial
patch date
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
t4150: test applyi
n
g StGit series
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
am: teac
h
StGit patch
p
arser
h
ow to
r
ea
d
from st
d
i
n
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-12
Pau
l
Tan
t
0302:
"unr
e
adable
"
t
e
st needs SANITY prereq
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am --abort:
keep unrel
a
ted commi
t
s on
unb
o
rn br
a
nch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am --abor
t
: sup
p
ort aborti
n
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 introduce
d
by failed 3way
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am --skip: support skippin
g
whil
e
o
n
unborn
bran
c
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
a
m
-3: support 3way
m
erge on unborn branch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Pau
l
Tan
am --sk
i
p:
r
eve
r
t ch
a
nges introduced by failed 3way
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
t4150: test applying StG
i
t
p
atch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pull: u
s
e git
-
rev-parse --parseopt for option parsing
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-02
Paul
T
an
pull: ha
n
d
l
e
git-fet
c
h's option
s
as well
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
P
au
l
Tan
t
5
520: ch
e
ck reflo
g
ac
t
ion
i
n
fast-
f
orward merge
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t
5
521:
test --dry-run does not mak
e
any changes
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul T
a
n
t5520: tes
t
--rebase
failure
o
n
u
nborn branc
h
with
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Pau
l
Tan
t5520:
test --rebase wi
t
h
m
ult
i
p
l
e
b
r
a
nches
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul
Tan
t5520: test work tree fast
-
forward when fetch updates
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t552
0
: test
fo
r
failure if index has
u
nresolved entries
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Ta
n
p
ull: parse p
u
ll
.
ff
a
s a
b
ool
or string
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
p
ull: mak
e
pull
.
ff=tr
u
e
o
ve
r
ride
merge
.
ff
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Ta
n
pu
l
l:
han
d
l
e
-
-
log=<n
>
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
t55
2
0: test no merge can
d
idates cases
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
P
a
u
l
T
a
n
t5520: prev
e
nt
fi
e
ld splitting in cont
e
nt compa
r
i
s
ons
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-14
Paul Tan
pull: remove --
t
ags
error in no merge cand
i
dates case
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
next