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
am: let --signoff override --no-signoff
2015-08-12
Paul Tan
a
m:
l
et --s
i
g
n
off overrid
e
--no-signoff
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-12
Paul
T
an
am: let c
o
mma
n
d-lin
e
optio
n
s ov
e
rrid
e
saved op
t
ions
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-12
Paul Tan
test_
t
e
r
minal: redirect child
p
r
oce
s
s' stdin to a pty
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
ltin-am: remove red
i
r
e
ctio
n
to g
i
t-a
m
.
sh
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-am
:
check for valid comm
i
tter ident
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
builtin-am: impl
e
ment legacy -b
/
--binary option
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
builtin-
a
m:
i
m
p
l
emen
t
-i/-
-
int
e
r
a
ctiv
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
builtin-am: s
u
ppo
r
t a
n
d auto-d
e
tec
t
mercurial
p
a
tches
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
l
ti
n
-am: support
and auto-
d
etect S
t
G
it series file
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul
T
an
b
uiltin-a
m
:
support and auto-de
t
ect StGit patches
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
bu
i
ltin-am: rerere s
u
p
p
ort
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am:
inv
o
k
e post-a
p
plyp
a
tch
hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am
:
invoke
p
re
-
applypatch hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
b
ui
l
ti
n
-am: invoke a
p
plypatch-msg hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l
T
an
bu
i
ltin-
a
m:
s
u
pport aut
o
ma
t
ic notes copying
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-a
m
: invoke post-rewr
i
te hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: im
p
lement -S
/
--gpg-sig
n
, commit
.
g
pgsi
g
n
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
bu
i
ltin-a
m
: i
m
plement -
-
commi
t
te
r
-da
t
e-is-author-date
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
b
uiltin-am: implement -
-
ignore-d
a
t
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builti
n
-
am:
pass git-apply's
o
ptions to git-apply
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
builtin
-
a
m
:
i
mpl
e
me
n
t --[n
o
-]scissors
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
bu
i
lti
n
-am: suppo
r
t -
-
keep-cr, am
.
keepcr
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement --[no-]m
e
ssage-id, a
m
.
messa
g
eid
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
: implement -k/--k
e
ep, --keep-non-patch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
ltin-am:
i
mplement
-
u/--utf8
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
bu
i
ltin
-
a
m
: h
a
n
dle stray st
a
te directory
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builtin
-
am: bypass
git-mailin
f
o wh
e
n
--
r
ebasing
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
l
tin-am:
impleme
n
t --re
b
a
s
i
n
g m
o
de
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
bui
l
tin-am: implement --3wa
y
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
cache-t
r
ee: introduce w
r
ite_
i
ndex_as_tree()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
b
u
iltin-am: imple
m
ent
-s/--signoff
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
builti
n
-am: exit with user friendly message
on failu
r
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul
T
an
builtin-am
:
implement -q/--qu
i
et
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builtin-am:
reje
c
t
patches whe
n
there's a sess
i
on in
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
iltin-am: im
p
lement -
-
abort
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implemen
t
--skip
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
builtin
-
am: don't
p
a
rse mail when resum
i
ng
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l Tan
b
uiltin-am:
impleme
n
t -
-
resolved/--continue
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
ltin
-
am: refuse to app
l
y patches if index is di
r
ty
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
builtin-am: implement c
o
mmi
t
ting applied p
a
tch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
bui
l
ti
n
-am: a
p
ply patc
h
w
i
t
h
g
i
t-app
l
y
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l
T
a
n
builtin-am: extract patch and commit info wit
h
g
i
t
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
builtin-am: auto-detect
m
b
ox
pa
t
ches
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
built
i
n-
a
m: split out mbox/maildir patc
h
e
s
w
i
t
h git
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bui
l
tin-am: implement patch queue mechanis
m
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement ske
l
e
t
al builtin am
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Ta
n
wra
p
per: implement xfopen()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
w
r
apper: implement
x
open
(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l Tan
t3901: test git-am encodi
n
g co
n
ve
r
sion
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Ta
n
t3418: n
o
n-inte
r
active
r
ebase --c
o
ntinu
e
with
rerere
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
Tan
t4150: tests
f
or am --[no-]scissors
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
T
an
t4150: am with po
s
t-applypa
t
ch hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Pau
l
Tan
t4150: am wi
t
h
p
r
e-applypatch hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l
T
an
t4150
:
am with applypatch-msg hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
a
u
l
Tan
t
4
1
5
0
: am -
-
resolved fails if index has unmerged
entries
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
4
150: am
-
-resolved fails if ind
e
x has no changes
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul T
a
n
t4150: a
m
r
efuses patch
e
s when paus
e
d
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4151: am --abort
w
ill keep
d
irty index in
t
act
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t415
0
:
a
m fails if index is dirt
y
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-07
Paul Tan
t4150: am
.
message
i
d really ad
d
s
the
m
essage id
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul T
a
n
pull: remo
v
e re
d
i
r
e
c
tion to
git-pu
l
l
.
sh
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul
Ta
n
p
u
ll --rebase: error on no merge candidate cases
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
u
ll --rebase:
exit early when the wo
r
king direct
o
ry
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul
Tan
pull: confi
g
ure --rebase vi
a
branch
.
<name>
.
rebase or
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: teach gi
t
pull about
-
-rebase
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
P
a
ul T
a
n
pull
:
set reflog message
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
u
ll: implement pulling into an
u
nborn bra
n
ch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Pa
u
l Tan
pull
:
fas
t
-forward w
o
rk
i
ng tr
e
e if
h
ead
is upda
t
ed
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: c
h
eck if i
n
unr
e
s
olved
m
erge stat
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull:
support pull
.
ff config
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
P
a
ul Tan
p
u
ll: error on no merg
e
candidates
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul
T
an
p
u
ll:
pass g
i
t-f
e
tch's options to git-f
e
tch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull:
pa
s
s
g
it
-
me
r
ge
'
s options to
g
it
-
mer
g
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l
T
an
pull: pa
s
s verbosity, --progress f
l
a
g
s to fetch and
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
p
ull: implement
f
etch + merge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull: implem
e
nt skeletal builtin
pull
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Ta
n
argv-
a
rray
:
imple
m
ent arg
v
_ar
r
ay_pus
h
v
()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l Tan
parse-options
-
cb
:
implement par
s
e_
o
pt_pass
t
hru_argv()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
parse-optio
n
s-
c
b
:
i
mpl
e
me
n
t parse_opt_passthru()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul T
a
n
am
:
teach
m
ercurial patch parser ho
w
to read
f
r
om stdin
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul
T
an
am: use gmtime() to parse m
e
rcurial patch
d
ate
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
P
aul
Tan
t4150:
t
e
s
t
applying StG
i
t ser
i
e
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
am: teach StG
i
t p
a
tch parser how to read
fro
m
stdin
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-12
Paul Tan
t0
3
02:
"unre
a
dable" test needs SAN
I
TY prereq
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am --abo
r
t: keep
u
nrelated commits o
n
unborn
b
ranch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am --abort: suppor
t
aborti
n
g to
u
nborn branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
P
a
u
l
Tan
am --abort: re
v
ert changes int
r
odu
c
ed
by fa
i
le
d
3wa
y
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
a
m
--ski
p
: supp
o
r
t
skipp
i
ng
w
hile o
n
unbo
r
n branc
h
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
P
au
l
Tan
am
-3: support
3
way me
r
ge on unborn
branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
a
m
--skip:
r
evert changes introduced by failed 3way
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
t4150:
test
a
pply
i
ng StGit patc
h
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul
T
an
pu
l
l: use git-r
e
v-parse --pars
e
opt for option pars
i
ng
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul
T
an
pu
l
l: ha
n
dle git-fetc
h
's options as well
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: check ref
l
og
a
ction in
fast-forward
merge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul
Tan
t55
2
1: tes
t
--dry-run does not make any changes
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: t
e
st --reba
s
e
failure on unbo
r
n
b
ra
n
ch wit
h
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5
5
20: tes
t
-
-rebase with
m
ultiple bra
n
ches
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
P
aul
Tan
t55
2
0: tes
t
work
t
ree fast-forward when fetch updat
e
s
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul T
a
n
t
5
520: test for failure
if index
h
as
u
nresolved entrie
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull: p
a
rse
p
u
l
l
.
ff as a bool
or string
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
next