repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
builtin-am: rerere support
2015-08-05
Pau
l
Tan
b
u
ilt
i
n
-
am: rerere support
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
builtin-a
m
:
invoke post-ap
p
l
y
patch hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
b
u
il
t
in-am: invoke p
r
e-
a
pplypatch
hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
buil
t
in-am: invoke ap
p
lypatc
h
-
m
s
g hoo
k
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
b
u
iltin-a
m
: suppor
t
automatic notes
c
opying
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul T
a
n
built
i
n-am: in
v
oke po
s
t-r
e
write hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement -S/--gpg-sign, commit
.
gpgsign
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
l
t
in-am: im
p
l
ement --co
m
m
itte
r
-date-
i
s
-aut
h
or-
d
ate
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement --ign
o
re
-
date
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
i
ltin
-
am: pass git-ap
p
ly's options to
git-apply
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-a
m
: i
m
plement --[no-]s
c
i
s
so
r
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
builtin-am:
s
upport
-
-kee
p
-
cr, am
.
keepcr
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bui
l
tin-
a
m: imp
l
em
e
nt
--[no-]message-id, am
.
messageid
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
buil
t
in-am: i
m
plement -k/--keep, --keep-non-patch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
bu
i
ltin-am: implement -u
/
--utf8
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
buil
t
in-
a
m: han
d
le stray state
d
irector
y
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bui
l
ti
n
-am:
b
ypas
s
git-mailinfo when --rebasing
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
iltin-am: imp
l
ement -
-
rebas
i
ng m
o
de
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
l
t
in-a
m
:
impleme
n
t -
-
3
way
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
cache
-
tree: introduc
e
w
r
i
te_index_
a
s_tree()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bui
l
tin-am: implement -s/-
-
si
g
nof
f
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l T
a
n
bui
l
tin-am: exi
t
w
i
t
h u
s
er
f
riendly messa
g
e on failu
r
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
lt
i
n
-
am: implement
-q/--quiet
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul T
a
n
b
uiltin-am: reject patches whe
n
there's a se
s
s
i
o
n i
n
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul
T
an
b
u
i
ltin-am: implemen
t
--ab
o
r
t
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
builtin-am: implement --skip
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul
T
an
bu
i
ltin-am: d
o
n't parse mail when resuming
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bui
l
ti
n
-
am:
imple
m
ent --
r
esol
v
ed/--contin
u
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
iltin-am: refuse to apply patche
s
if in
d
ex is dir
t
y
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement committin
g
applie
d
patch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
builtin-am: apply patch
w
ith g
i
t-a
p
ply
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
au
l
Tan
builtin-am
:
extract patch and commit info with
g
it
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
iltin-am: auto-d
e
tect mbox p
a
tches
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
builtin-am: spli
t
out mbox/maildir
p
at
c
hes wi
t
h git
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
b
uiltin-
a
m: impl
e
ment pa
t
c
h
queue mechanism
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
builtin-am: implement skeletal
b
u
i
ltin
a
m
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
wrappe
r
: implement xfopen
(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
wr
a
pp
e
r: implement xopen()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t3901: test git-am encodi
n
g conversion
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l Tan
t3418
:
no
n
-
in
t
e
r
a
c
t
ive reb
a
s
e --continue
w
ith rerere
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul T
a
n
t4150: tests for am --[no-
]
scis
s
ors
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am
w
ith post-a
p
plypa
t
ch h
o
ok
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
aul
Tan
t4150: am with pre
-
applypatch hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150:
am
w
ith app
l
ypatch-m
s
g hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
T
an
t415
0
: am -
-
re
s
olved
fails if index h
a
s
unmerged entries
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am --resolve
d
f
a
i
ls
if index
h
a
s
no cha
n
ges
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: a
m
refuses patches
w
hen pause
d
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
T
an
t41
5
1: am --abort will keep dirty index in
t
ac
t
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
4150
:
a
m
fails i
f
in
d
ex is
d
irty
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-07
P
aul
Tan
t4150: am
.
me
s
s
a
g
e
id really adds the me
s
sage i
d
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Pa
u
l Tan
pull: remove r
e
direction
to git-pull
.
sh
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull --reba
s
e: er
r
or on no
m
er
g
e can
d
id
a
te c
a
ses
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
P
a
ul
Tan
pull --reb
a
se: exit ea
r
l
y
when t
h
e
w
orking
d
irectory
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pul
l
: con
f
igure --
r
ebase via
b
ranch
.
<n
a
m
e>
.
rebase or
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Pa
u
l Tan
pul
l
: teach git pull about
--rebas
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: set
reflog mes
s
age
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
P
a
ul Ta
n
pull: impleme
n
t pullin
g
in
t
o an unborn
branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
P
aul Tan
pull: f
a
s
t
-
f
orward
working
t
re
e
if head i
s
updated
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: chec
k
if in unre
s
olved mer
g
e stat
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
P
a
ul Tan
pu
l
l:
su
p
por
t
pull
.
ff config
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Pau
l
Tan
pul
l
:
error on
no merge can
d
i
dates
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul T
a
n
pull: pass git-f
e
tc
h
's op
t
ions to g
i
t-f
e
tch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l Ta
n
pul
l
: pass git-me
r
ge
'
s options to git-merge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul
Tan
pull: p
a
ss
verbosity, --progress flags t
o
fetch and
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull: impleme
n
t fetch + mer
g
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull: implement
s
kel
e
tal builtin pull
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
a
r
gv-array:
i
mple
m
ent argv_array_
p
ushv()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
P
a
u
l
T
an
parse-opti
o
ns-cb: implement parse
_
o
pt_passthru
_
a
r
gv()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pars
e
-
o
ption
s
-
c
b: implement pars
e
_op
t
_
p
assthru(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
P
aul Tan
am: teach mercurial patch parser how to rea
d
from stdin
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
am: use gm
t
i
m
e() to parse me
r
curi
a
l patch da
t
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l
T
an
t4
1
50
:
test applying StGit s
e
ri
e
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l
Tan
am: te
a
c
h
StGit pa
t
ch parser how to read fr
o
m stdin
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-12
Paul Tan
t0302: "un
r
eadable" test
needs
S
ANITY prereq
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
a
m
--abort: kee
p
unre
l
ate
d
commits on unb
o
rn branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul
T
an
am --ab
o
rt: support
aborting to
unborn b
r
anch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Pa
u
l
Tan
am
--abort: revert chan
g
es introduce
d
by
fa
i
led 3way
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul
Tan
am --skip
:
s
u
p
port skipping whi
l
e on unborn branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Pa
u
l
Tan
am -3: support 3wa
y
merge
on
u
nborn branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am --skip
:
revert cha
n
ges
introd
u
ced
b
y
failed 3
w
a
y
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul
Tan
t41
5
0
: test applying StG
i
t patch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pul
l
: use gi
t
-rev-parse --
p
arseop
t
for
option parsing
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
P
a
ul Tan
pull: han
d
l
e
git-fetch'
s
o
p
ti
o
ns as
well
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520:
check r
e
f
log a
c
tio
n
i
n fast
-
forward
m
e
rge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t552
1
: test
--dr
y
-run does not make any changes
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
P
a
ul Tan
t5520
:
test --rebase failur
e
on unborn b
r
anch
w
ith
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul
T
an
t5520: test --
r
ebas
e
with m
u
ltiple
b
ranc
h
es
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l Tan
t5520: te
s
t work tr
e
e fast-forward whe
n
fetch up
d
ates
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
P
aul
T
an
t5520:
t
e
st for failure if index ha
s
u
nresol
v
ed entries
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull: parse p
u
ll
.
ff as a bool or
s
trin
g
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Pa
u
l
Tan
pull: make pull
.
f
f=true over
r
i
d
e
merge
.
ff
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul
Tan
pu
l
l
:
handle -
-
log=<
n
>
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
t5520: test no merge candidates ca
s
es
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
t5520: prevent
f
i
e
ld s
p
lit
t
i
n
g in content
com
p
arison
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-14
Paul
T
an
pull: remove --ta
g
s erro
r
in no merge can
d
idate
s
c
a
s
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
path
.
c: remove home_config_paths()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
g
it-confi
g
: replace use of home_
c
onfig_paths(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Ta
n
git
-
commi
t
: r
e
place use
o
f
home_co
n
fig_paths()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
cr
e
dential-sto
r
e
.
c: replace home_
c
onfig_pa
t
hs(
)
with
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
dir
.
c: replace h
o
me_config_paths(
)
with xdg_co
n
fig_home()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
next