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: exit with user friendly message on failure
2015-08-05
Paul Tan
builtin-am: e
x
i
t
w
ith us
e
r fri
e
ndly message on failure
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builti
n
-am: im
p
l
e
m
en
t
-q/--q
u
i
e
t
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
built
i
n-am: reject patc
h
es when there
'
s a session in
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
bu
i
ltin-am: implement
--ab
o
rt
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
builtin-am: implement --skip
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l Tan
bui
l
tin-
a
m: don't pars
e
mail when resumin
g
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: impl
e
m
ent --res
o
lve
d
/-
-
continu
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul
Tan
bu
i
ltin-
a
m: refuse
to apply patches if
i
ndex
i
s di
r
t
y
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
built
i
n-am: i
m
p
lem
e
nt commit
t
ing app
l
i
ed pat
c
h
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builti
n
-am: app
l
y patch
with git-apply
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
buil
t
in-am
:
extract pat
c
h and
c
ommit info
with
g
i
t
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
lti
n
-am
:
a
u
to-detect mbo
x
pat
c
hes
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-
a
m:
sp
l
i
t
out mbox/m
a
ildir patc
h
e
s with git
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
bu
i
ltin-am: imp
l
ement patch
q
ueue mechanism
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul
Tan
builtin-
a
m: imp
l
ement s
k
eletal builtin am
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
wrapp
e
r:
implement x
f
o
p
e
n
()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
wrapper: implement xopen()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l Tan
t
3
90
1
:
test
gi
t
-am encoding con
v
e
rsion
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
T
an
t341
8
: non-inter
a
ctive rebase --c
o
ntinu
e
w
i
th rerere
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul T
a
n
t
4
1
50: test
s
f
or am --
[
no
-
]scissors
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
4
1
50: am
with p
o
s
t-applypatch hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
4
1
5
0
:
a
m with pre-applypatch hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul T
a
n
t4150: am with
appl
y
patch-msg ho
o
k
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
T
an
t4150: a
m
--resolved fa
i
l
s
i
f
ind
e
x has
u
n
merged entries
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
4
150: am --resolved fails if inde
x
has no changes
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Pau
l
T
an
t4150:
am refuses
patches when p
a
u
s
ed
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4151: a
m
--abor
t
will
k
eep dirty index intact
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul T
a
n
t4150: am
f
ails i
f
index is dirty
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-07
P
au
l
T
a
n
t4150: am
.
me
s
sa
g
eid really
a
d
d
s the messa
g
e id
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul
Tan
pull: remove r
e
dir
e
ction to git
-
pu
l
l
.
s
h
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul
T
a
n
p
u
ll --
r
e
base: error
on no merge candidat
e
cases
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull --reb
a
se: e
x
it early
w
h
e
n
th
e
working director
y
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull:
c
onfigure --reb
a
se
via branc
h
.
<name>
.
rebase or
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Pau
l
Tan
pull: tea
c
h git
p
ul
l
about --reba
s
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul
Tan
p
u
ll: set reflog
mess
a
ge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Pau
l
Tan
pu
l
l: implement pulling into
an unbor
n
bran
c
h
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pu
l
l: fast-forward w
o
rking tree
if head is updated
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul T
a
n
pul
l
:
c
heck
if
in unresolved
merge state
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul T
a
n
pull:
s
u
p
port pull
.
ff
config
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: e
r
ror
o
n no mer
g
e candidates
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul
Tan
pull: p
a
ss git-f
e
tch's
o
pti
o
n
s
to git-fet
c
h
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull: pass git-merge's options to git-merge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul T
a
n
pull: pass verb
o
sity, --progr
e
ss
f
lags
t
o
fetch and
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
P
a
u
l Tan
pul
l
: impl
e
ment fetch +
m
e
r
g
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
Ta
n
pull: implement skeletal built
i
n
pull
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
argv-
a
rray: i
m
plement argv_arra
y
_pushv(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
Tan
p
arse-options-cb
:
implement p
a
rs
e
_
opt_passthru_ar
g
v
(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l Tan
parse-option
s
-cb: implement parse_opt_pa
s
s
t
hru()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul T
a
n
am: teach m
e
rcurial patch
parser ho
w
to read from stdin
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
am: use gmtime() to parse
mercu
r
ial patch date
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul
T
a
n
t4150: test app
l
ying StGit se
r
ies
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l Tan
a
m
: t
e
a
c
h
S
t
Git patch p
a
rser how
t
o read
f
rom stdin
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-12
Paul Tan
t0302: "unr
e
a
dable" test needs SANITY prereq
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
P
aul Tan
am --abort: k
e
ep unrelated commits on un
b
orn b
r
anch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
P
a
ul Tan
a
m
--a
b
ort: support abor
t
ing to unbor
n
bra
n
c
h
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
P
au
l
Ta
n
am --
a
bort:
r
eve
r
t cha
n
ges
i
ntroduced by failed 3
w
ay
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
P
a
u
l
Tan
am --skip: support
skipping
w
hil
e
on unborn bra
n
ch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul
Tan
am -3: suppor
t
3way
m
erge
o
n unborn
br
a
nch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Pau
l
Tan
a
m
-
-skip
:
revert changes intr
o
duced b
y
failed 3way
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
t41
5
0: test apply
i
ng StG
i
t
patch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pull:
use
git
-
rev
-
parse -
-
parse
o
pt fo
r
o
pt
i
on
parsing
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pull: han
d
le git-fetc
h
'
s options as w
e
ll
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: check reflo
g
act
i
on in fast-forwar
d
merg
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
P
au
l
Tan
t5521: test
-
-dry-ru
n
do
e
s not
m
ake
any c
h
anges
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
P
a
ul Tan
t
552
0
:
test --re
b
a
se failure on
un
b
orn branch with
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
P
au
l
Tan
t5520: test
--rebase with mu
l
ti
p
le branches
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520
:
test
w
o
rk tree f
a
st-forward
when fetch updates
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: test
for failure i
f
index
has un
r
esolv
e
d
entries
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull: pa
r
se
p
ull
.
ff as
a
bool
or str
i
ng
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
P
aul Tan
p
u
ll: make pull
.
ff=true overr
i
de merge
.
ff
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pul
l
: ha
n
dle --log=<n>
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul
T
an
t5520: test
n
o merge can
d
idates c
a
ses
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Pa
u
l
Tan
t5520: prevent field s
p
litt
i
ng in
c
o
ntent comparisons
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-14
Paul
Ta
n
pull:
remove
--tag
s
erro
r
in no merge can
d
i
d
ates case
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
p
a
t
h
.
c: re
m
ove hom
e
_c
o
nfig_pa
t
hs()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul
Tan
git-config: replace use of h
o
me_config_paths
(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
g
i
t
-commit: replace use
o
f h
o
m
e
_c
o
nfig_paths()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
credential-st
o
re
.
c: replace home_co
n
fig
_
p
a
t
h
s() with
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
dir
.
c: replace home_config_paths
(
) with xdg_co
n
fi
g
_
home()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
at
t
r
.
c: re
p
lace home_
c
onfig_paths(
)
with xdg_config_ho
m
e()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Ta
n
path
.
c: implemen
t
xdg_config_home
(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-31
Pau
l
T
a
n
enter_repo()
:
fi
x
doc
s
to
match code
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Paul Tan
t
0302: test cred
e
n
tial-store su
p
por
t
for XD
G
_CONF
I
G_HOME
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
P
a
ul T
a
n
git-cr
e
dential-sto
r
e:
s
u
p
por
t
XDG_CONFIG_HOME
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Paul Tan
git-crede
n
t
i
al-store
:
s
u
pport multi
p
le c
r
edential fi
l
es
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree