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: implement --ignore-date
2015-08-05
Paul Tan
builtin-am: im
p
l
e
ment
-
-ignore-d
a
te
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builtin-am: pass
git
-
apply's o
p
ti
o
ns
t
o git-a
p
p
l
y
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: impleme
n
t --[no
-
]
sci
s
sors
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l
Ta
n
builtin-am: support
-
-keep-cr, am
.
keepcr
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-am: imp
l
ement -
-
[no-]messag
e
-id, am
.
messageid
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
iltin-
a
m: implement -k
/
-
-k
e
ep, --kee
p
-non-patch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin-am: implement -u/
-
-utf8
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
built
i
n
-
am: handle stray state di
r
ec
t
ory
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
bu
i
lti
n
-am: b
y
pass git-mailinfo whe
n
--rebasin
g
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-am: i
m
pleme
n
t --
r
ebasing mode
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
au
l
Tan
bu
i
ltin-am: implem
e
nt --
3
wa
y
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
cache-tree
:
i
n
troduce write_index_as_tree()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
buil
t
in-am: implement -s/--sign
o
ff
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul
T
an
builtin-am: exit with us
e
r friendly message on failure
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
built
i
n-am:
i
m
plement -q/--quiet
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builtin-am:
reject patches
w
hen t
h
ere's a session in
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-am: im
p
l
ement --abort
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: imple
m
ent --
s
kip
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin
-
am: don't
p
arse mail wh
e
n resuming
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uiltin
-
a
m
: i
m
p
lement --
r
esolved/--contin
u
e
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builtin-am:
r
e
f
us
e
to a
p
ply pa
t
ches
i
f index is dirt
y
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am:
i
mplement committing app
l
ied
p
atch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin-am:
apply patch wit
h
git-apply
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
bui
l
t
i
n-am: extract pa
t
ch and
com
m
it info with g
i
t
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l Tan
builtin-am: a
u
t
o-detect mbox patc
h
es
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
i
l
tin-am: sp
l
it out
m
box/maildir patc
h
es with git
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
T
a
n
b
u
il
t
i
n
-am: implement pat
c
h queue mechanism
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
buil
t
in-am: impl
e
ment skeletal bu
i
lti
n
am
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
wrapper:
implement x
f
o
pe
n
()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
w
ra
p
per: imp
l
ement xopen()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul
Ta
n
t3901:
t
est git-am encod
i
ng con
v
ersion
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
3418: non-inte
r
active rebase -
-
continu
e
with rerere
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l
T
an
t4
1
50: tests
f
or a
m
--[no-]sci
s
sors
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t41
5
0: am with pos
t
-appl
y
p
atch hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t41
5
0
:
am with pre-applypa
t
c
h
hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
P
a
ul Tan
t4150: am with applypatch-msg ho
o
k
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Ta
n
t4150: am --
r
e
solved
fails i
f
index has
u
nm
e
rged en
t
r
i
es
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4
1
50: am -
-
res
o
lved fails
i
f i
n
dex has no ch
a
nges
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul T
a
n
t4150: am r
e
fuse
s
patches when paused
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
P
a
ul Tan
t4
1
5
1:
a
m --abort will
ke
e
p dirty
i
ndex inta
c
t
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul
Tan
t415
0
: am fa
i
ls if inde
x
i
s
dirty
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-07
Pau
l
T
a
n
t4150: am
.
message
i
d
r
eally ad
d
s th
e
messag
e
id
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
u
ll: r
e
mov
e
redire
c
tion to
git-p
u
ll
.
sh
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
ull --re
b
ase:
e
rror on
n
o merg
e
candidate
c
a
s
es
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull --rebas
e
:
exit early
w
h
e
n the workin
g
directo
r
y
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
P
a
ul Tan
pu
l
l: configure --rebase via
b
ranch
.
<name>
.
rebas
e
or
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul
T
an
pull
:
teach
g
it pull
a
b
o
u
t
--reb
a
se
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: s
e
t reflog message
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Pau
l
Tan
pull: imple
m
en
t
pulling into a
n
unborn branch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Pau
l
T
an
pull: fast-for
w
ard workin
g
t
r
e
e if hea
d
is
u
pd
a
ted
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: check if
in unresolved
merge state
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul
T
an
pull: support pul
l
.
ff config
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: error on no merge candidates
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
u
ll
:
pass git-fe
t
ch's optio
n
s to
git-fetch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
p
ull: p
a
ss
git
-
me
r
ge's opti
o
ns to g
i
t-me
r
ge
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
T
a
n
p
ul
l
: pass verbosity, --pro
g
ress flag
s
to fetch and
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
Tan
p
u
l
l
: imple
m
ent fetch + m
e
rge
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull
:
imple
m
ent skeletal builtin pull
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l T
a
n
a
r
gv-array:
i
mplement
a
rgv_a
r
ray_p
u
s
hv()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
P
aul Tan
pa
r
se-options-cb: impl
e
m
e
nt pars
e
_opt_p
a
ssthru_argv()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
P
aul Tan
parse-opt
i
o
ns-c
b
:
i
m
plement
parse_opt
_
pa
s
s
t
hru()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
am: teac
h
mer
c
u
r
i
al patch parser how
to read from stdin
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
Tan
am: use g
m
time() to parse m
e
rcuria
l
patch date
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
P
a
u
l
Tan
t4150: t
e
s
t
a
pplying StGi
t
s
e
ries
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
am:
t
each S
t
Git pat
c
h parse
r
h
o
w to read
fro
m
s
t
din
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-12
Paul Tan
t0302: "u
n
r
eadable" te
s
t needs SANIT
Y
prereq
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
P
aul T
a
n
am --
a
bort:
k
e
ep unrel
a
t
e
d
commits
on unborn
branc
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Pa
u
l Tan
am --abort: support aborting to unborn branch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
P
a
u
l T
a
n
a
m --abort: revert change
s
introduced by failed 3way
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
P
a
ul Tan
am --skip:
s
upport skipping while on unborn bran
c
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
P
a
ul Tan
a
m
-3: sup
p
ort 3
w
ay merge on
u
nbo
r
n
br
a
nch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
P
aul Tan
am --
s
k
ip:
r
evert cha
n
ge
s
introdu
c
e
d
b
y
fa
i
l
e
d 3way
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
t
4150: tes
t
a
ppl
y
ing
S
t
G
it patch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pull:
use
g
it-rev-parse --parseo
p
t
for option parsing
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
p
u
l
l: handle git-fetch's opt
i
o
n
s
as
w
e
ll
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
P
a
ul Ta
n
t5520:
c
heck reflog action in
fast
-
f
orwa
r
d merge
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t55
2
1: test --d
r
y-run
d
oes not
m
ake any changes
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520
:
test --reb
a
se failur
e
on unborn bra
n
ch with
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t
5
520: test --
r
eba
s
e with multiple
b
ranch
e
s
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t552
0
:
t
es
t
work tree fast-forward when fetch
update
s
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l
Tan
t5520: test
f
or failure if
i
nd
e
x has
u
nresol
v
e
d entries
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull: parse pull
.
ff
a
s
a bo
o
l
or string
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull: make pull
.
ff=tr
u
e override m
e
rge
.
ff
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
P
aul Tan
p
ull:
h
andle --log=<n>
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
P
au
l
Tan
t5520:
test no mer
g
e
candidate
s
cases
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Pa
u
l
T
an
t552
0
: prevent fiel
d
splitting in content c
o
mparisons
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-14
Paul
T
an
pull: remove
-
-
tags erro
r
i
n
no merge
candidates c
a
se
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
path
.
c
: remove hom
e
_config_paths
(
)
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
gi
t
-config:
replace
u
se of home_config_paths()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
git-commit: re
p
lace
use
of home_config_paths()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Pa
u
l Tan
creden
t
ia
l
-store
.
c: replace home
_
config_p
a
ths() with
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
d
i
r
.
c: repla
c
e
home_config_p
a
t
hs()
w
ith xdg_c
o
n
fig_home()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
a
t
tr
.
c: replace home_c
o
nfig
_
paths() w
i
th
x
dg_config_hom
e
(
)
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul
T
a
n
path
.
c: impl
e
m
ent xdg_confi
g
_hom
e
()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-31
Paul Tan
enter_repo(): fi
x
docs to
m
atch
code
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-24
P
a
u
l
T
a
n
t03
0
2: test
c
redenti
a
l
-store
s
upport for XDG_CONFIG_HOME
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-24
Pau
l
T
an
git-cred
e
nt
i
al-store: support XD
G
_CONFIG_HOME
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-24
Paul Tan
g
it-credential-store
:
support mul
t
iple cred
e
ntial
f
i
les
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree