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: don't parse mail when resuming
2015-08-05
Paul Tan
bu
i
ltin-am
:
don
'
t pa
r
se m
a
il
when r
e
suming
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: imple
m
e
n
t --resolved/--continue
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
buil
t
in-a
m
: refuse
t
o apply
pat
c
hes if i
n
dex is dirty
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builtin-am: im
p
le
m
ent committing ap
p
lie
d
patch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builtin-
a
m: a
p
ply patch wit
h
git-apply
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builtin-am:
e
xtract patch
and c
o
mmit info wit
h
gi
t
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
a
n
builtin-am: auto-detect mbo
x
pat
c
h
es
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: spl
i
t
out
m
b
ox/maild
i
r p
a
tches wit
h
git
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: i
m
plement patc
h
queue me
c
h
anism
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l
T
an
b
uiltin-
a
m
:
implemen
t
skeletal bui
l
tin am
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
wrapper
:
implement xfopen()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
wra
p
per: imp
l
e
ment xo
p
en(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
aul Tan
t39
0
1
:
test
git-am encoding
c
onv
e
r
sion
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
Tan
t34
1
8: non-interactive rebase
--c
o
nt
i
nue w
i
th rerere
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
aul
Tan
t4150: te
s
ts
for am
-
-
[
n
o
-]scissors
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
a
u
l
Tan
t4150:
am with po
s
t-applypatch hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
4
150:
a
m with pre-applypa
t
ch
h
o
o
k
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am with applypa
t
ch-
m
sg h
o
ok
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul T
a
n
t41
5
0: am --resol
v
ed fa
i
ls if index h
a
s unmer
g
ed e
n
t
r
i
e
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Pau
l
T
an
t415
0
:
a
m
-
-
resolved fails if
inde
x
h
as no
c
hanges
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
Tan
t
4
150: am refuses
patches when paused
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4151: am --abort will keep dirty in
d
e
x
intact
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150
:
am fa
i
ls if
index is dirty
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-07
Paul Tan
t4
1
50: am
.
mes
s
ageid
r
eally
adds th
e
mes
s
a
ge id
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul T
a
n
pull:
remove redir
e
ction t
o
gi
t
-
p
u
ll
.
sh
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul
T
an
pu
l
l --rebase: error
o
n
no me
r
ge candidat
e
c
ases
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Pau
l
Tan
pull --r
e
b
a
s
e
: exit early w
h
en the w
o
rking direct
o
r
y
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
u
l
l: configu
r
e -
-
rebas
e
via branc
h
.
<name>
.
re
b
as
e
or
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: teach git
p
ull about --rebase
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pul
l
: set reflog message
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
u
ll: implem
e
n
t pulling into an unborn branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
P
aul
Tan
pull: fast-forward
working tree if head is updated
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: check
i
f
in u
n
resolved merge st
a
te
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
P
aul Tan
pull:
supp
o
r
t
pull
.
f
f
config
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull:
e
r
ror on
n
o
merge candidat
e
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul T
a
n
pull: pass git-f
e
tch
'
s o
p
tion
s
to gi
t
-fe
t
ch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
P
a
u
l Tan
pull:
p
a
s
s git-merge's options t
o
git-merge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
P
a
ul Tan
p
u
ll: pass verb
o
sity, --
p
rogress fla
g
s to fetch and
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pul
l
: implement fet
c
h +
mer
g
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul
T
an
p
u
ll
:
implement s
k
el
e
t
a
l
b
uiltin pull
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
argv-
a
rray: implement argv_
a
rray_pushv(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l Tan
parse
-
options-cb:
implement parse_o
p
t_passthru_argv()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
Tan
parse-options-cb: impleme
n
t parse_o
p
t_
p
assthru()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
am: teach mercurial patc
h
p
a
rser how to re
a
d
from
s
tdin
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul
Tan
am: use gm
t
ime(
)
t
o
parse me
r
curial p
a
t
c
h dat
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
t
4
150: test
a
pplying StGit series
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul
T
a
n
am:
teach StGit patch
parser how to read f
r
om st
d
in
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-12
P
aul T
a
n
t0302: "un
r
e
a
dable" test n
e
e
d
s SANITY prere
q
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
a
m --abort:
keep u
n
re
l
a
t
ed commits on unborn branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
a
m
-
-abort
:
support ab
o
rting
to unborn branc
h
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul
Tan
a
m
--a
b
ort: revert changes introduced by failed 3w
a
y
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul T
a
n
a
m --skip: support
s
k
ipping
whil
e
on unborn
bran
c
h
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am -3: support 3way mer
g
e
on u
n
born branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
P
aul
T
an
a
m --skip: revert changes introduced by failed 3way
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul
Tan
t4150:
test a
p
plyin
g
S
tGit patch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pull: use g
i
t-rev-
p
arse --p
a
r
s
eopt for option
p
arsing
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul
T
an
pull: handle gi
t
-fetch
'
s option
s
as we
l
l
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l Tan
t5520:
c
heck
r
eflog action in
f
a
s
t-forw
a
rd mer
g
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
P
aul Tan
t5521: test --dry-run
does not
m
ake
an
y
changes
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t552
0
: tes
t
-
-rebase failur
e
on unborn bran
c
h with
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul
T
an
t5520:
test -
-
rebase with multiple br
a
nches
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: te
s
t work tree fast
-
forward when fetc
h
updates
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t552
0
:
t
est for fa
i
lure if
i
ndex
h
as unre
s
olved e
n
t
ries
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull: par
s
e
pull
.
ff
a
s a bool
or
string
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull
:
make pull
.
ff=true
o
v
e
r
ride mer
g
e
.
f
f
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Pa
u
l Tan
pull:
h
andle --log=<n>
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Pau
l
Tan
t
5
5
20:
t
e
s
t no
m
erge
candidates c
a
ses
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
P
a
ul Tan
t55
2
0: prev
e
nt fie
l
d s
p
litting in conten
t
c
o
mparisons
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-14
Paul Tan
pull: rem
o
ve --tags
error in no merge
candidates case
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
git-config:
r
e
p
l
ace
use of home_config_paths()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
git-commit: replace
u
se of home_config_paths()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
P
a
ul
Tan
crede
n
tial-store
.
c: rep
l
ac
e
home_config_paths() with
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
dir
.
c
: repla
c
e home_co
n
fig_paths
(
) wi
t
h xdg_config_home()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul T
a
n
attr
.
c: replace home_config_paths() with
x
dg_confi
g
_home()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
P
a
ul Tan
pa
t
h
.
c: implement
x
dg_con
f
ig_home()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-31
Paul Tan
ent
e
r
_repo(
)
: f
i
x docs to
m
atch co
d
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Pau
l
Tan
t
03
0
2: test c
r
edential-store support for XD
G
_CONFIG_HOME
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Paul T
a
n
git
-
credential-store: s
u
pport XDG_C
O
NFIG_HOME
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Paul Tan
git-cred
e
ntial-stor
e
: suppo
r
t
multiple c
r
edential files
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree