repo.or.cz
/
alt-git.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 --rebasing mode
2015-08-05
Paul Tan
b
uilti
n
-a
m
:
i
mplement
-
-rebasing mode
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am:
i
mplement --3way
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l
Tan
c
a
che-tre
e
: intr
o
duce write_index
_
as_tree()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
b
uiltin-am: impleme
n
t -
s
/--si
g
n
o
ff
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
au
l
Tan
built
i
n-am: exit with user
f
riendly m
e
s
sage on fail
u
re
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin
-
am: implement -q/--quiet
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
bu
i
lt
i
n-am: reject patches when there's
a
session in
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin
-
am
:
implement
-
-
a
bort
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
ltin
-
am:
i
mplem
e
nt
-
-s
k
ip
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
b
u
iltin-am
:
don't
parse mail when re
s
u
ming
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement --resolv
e
d/--conti
n
ue
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul
Tan
bu
i
ltin-am: ref
u
se to app
l
y patches if index is
d
irty
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-am: imp
l
em
e
n
t committing applied patch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
builti
n
-a
m
: apply patch with
g
it-apply
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin-am: extract
p
atch
and co
m
mit in
f
o wi
t
h git
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
b
uiltin-am: auto-de
t
ec
t
m
b
o
x patch
e
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin-am
:
spli
t
o
u
t m
b
ox/ma
i
ldi
r
p
a
tch
e
s
w
ith git
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am:
implement patch queue mechanism
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
i
l
tin-am: imp
l
eme
n
t skeletal buil
t
in am
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
wrapper: implement x
f
open()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
wrap
p
e
r
: implem
e
n
t
x
o
pen
(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Pau
l
T
a
n
t3901:
test git-am enc
o
ding conversion
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t3418: non-
i
n
teractive reb
a
se --continu
e
with rerere
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l Tan
t4
1
50: tests for am --[
n
o-]scissors
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
aul Tan
t4150
:
am with
p
o
st-applypatch h
o
ok
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
a
ul Tan
t4150: am
with pre
-
appl
y
p
a
tch
hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150:
a
m w
i
th app
l
ypatch-msg hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Pau
l
Tan
t4150: am --resolved fails if index has u
n
mer
g
ed entries
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
Tan
t4150: am
--resolved fails
if inde
x
h
a
s
no changes
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
Tan
t4150: am refuses
p
a
t
ch
e
s when pause
d
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
aul Tan
t4151: am
-
-abort will keep
d
irty in
d
ex intact
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
aul Ta
n
t4150: a
m
fails if i
n
dex is di
r
ty
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-07
Paul Tan
t4150: am
.
messageid
really
a
dds th
e
message id
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul
T
an
pull: remove
redire
c
tion to git-pull
.
s
h
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
ull
-
-rebase:
error on no merge
c
a
n
didate case
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Pau
l
Ta
n
pull
--rebas
e
: exit early when the workin
g
directory
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: config
u
re --r
e
base via branch
.
<name>
.
reb
a
se or
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
P
a
ul Tan
pull: teach git p
u
ll abo
u
t --re
b
ase
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul T
a
n
pull: set ref
l
og mes
s
ag
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul
T
an
pull: implement pulling i
n
to an
un
b
orn branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Pau
l
Ta
n
pull: fast-forward working tree if head is upda
t
ed
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Ta
n
pull: check if in unresolve
d
merge state
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
ull:
sup
p
ort pull
.
ff config
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
P
a
ul Tan
pu
l
l: e
r
ror
o
n no merge candi
d
ates
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pul
l
:
p
ass git-fet
c
h's
o
ptions t
o
git-fet
c
h
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul
T
an
pul
l
: p
a
ss
g
it-merge's opti
o
ns
to
git-
m
erge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull
:
p
ass
verbosity, --progre
s
s flags to fetch and
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul
T
a
n
pul
l
:
implement fetch + merge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul
Tan
pull: implement skeletal builtin pu
l
l
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul T
a
n
argv-
a
rray: implement ar
g
v_arra
y
_pushv()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
p
a
rse-options-cb: implement parse_opt_p
a
s
sth
r
u_argv()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
parse-opti
o
ns-cb: implement parse_opt_
p
assthru()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
am: teach mercurial p
a
t
c
h parser how to r
e
ad fr
o
m
st
d
in
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
P
a
ul Tan
am: us
e
gmtime()
to
parse mercuri
a
l p
a
tc
h
date
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
P
aul Tan
t4150: test ap
p
lying
S
tGit se
r
ies
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
a
m
:
t
ea
c
h
S
t
G
i
t p
a
tch parse
r
how to read
from stdin
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-12
Paul
T
an
t03
0
2: "unreadabl
e
" test needs SAN
I
TY
prereq
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul
T
a
n
am --a
b
o
rt: keep unrelated commits on unbor
n
branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am --abo
r
t
: sup
p
ort ab
o
rtin
g
to unborn branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Pau
l
Ta
n
am
-
-abort:
reve
r
t
c
hanges int
r
oduced by
f
ailed
3way
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
P
aul T
a
n
am --skip:
support skipping while on unb
o
rn
b
ranch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am -3: support
3way
merge o
n
u
n
born bran
c
h
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
P
aul Tan
am --sk
i
p:
re
v
ert changes in
t
rodu
c
ed by failed 3way
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul
Tan
t4150
:
test
applying
StGit
patch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul
Tan
pull:
use
g
it-rev-
p
arse --parseopt for
opt
i
o
n
parsing
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pull
:
handle
g
it-fetch's options
a
s wel
l
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Pau
l
Tan
t5520: c
h
eck reflog action
i
n fast-forwar
d
merge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
P
a
ul Tan
t5521: test --dry-run
d
oes
n
ot make any changes
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t
552
0
: test
--
r
ebase failure on unborn branch with
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: test --reb
a
se with multiple bra
n
ch
e
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: tes
t
work tree fast-
f
orward wh
e
n
fetc
h
updates
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t55
2
0
:
t
est for failure if index has u
n
resolved entries
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Ta
n
pull: pars
e
pu
l
l
.
ff as a bool or string
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
P
aul
T
an
pull: make pull
.
ff=
t
ru
e
o
v
er
r
ide
merge
.
ff
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull: h
a
ndle --log=<
n
>
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Pau
l
Tan
t5
5
20: test n
o
merge candi
d
ates cases
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
t5
5
20:
p
re
v
en
t
fiel
d
splitting
in
c
ontent comparisons
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-14
P
a
u
l
Ta
n
pull: remove --tags erro
r
in no merge candi
d
ates
case
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul
T
an
path
.
c: remo
v
e
home_config_paths(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul
T
an
git-config: repl
a
ce use o
f
home_config_
p
aths()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Pa
u
l
Tan
git
-
c
o
mmit: re
p
lace
u
s
e of
h
ome_
c
onf
i
g
_paths()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
P
a
ul T
a
n
credential-
s
t
ore
.
c: r
e
place home_config_paths() with
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul
Tan
d
ir
.
c: r
e
place
home_config_paths() with xdg_conf
i
g_home()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
attr
.
c: replace home_c
o
nfi
g
_paths() wit
h
xdg_
c
o
n
fig_hom
e
()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
pa
t
h
.
c: implement xdg_
c
onfi
g
_home()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-31
Paul Tan
enter_
r
epo(): fix docs to match code
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Paul Tan
t
030
2
: t
e
st creden
t
ial-store sup
p
o
rt
f
or
X
DG_CONFIG_HOME
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
P
aul
T
an
git-
c
redential-s
t
ore: su
p
port XDG_CONFIG_HOME
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Pa
u
l Tan
git-cr
e
dential-
s
tore: support mult
i
ple cre
d
ential file
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree