repo.or.cz
/
git
/
mjg.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 -k/--keep, --keep-non-patch
2015-08-05
Paul Tan
b
uilt
i
n-am:
implement -k/
-
-keep, --keep-non-patch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement -u/--utf8
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: h
a
n
d
le stray stat
e
di
r
e
ctory
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul
Tan
builtin-am: bypas
s
gi
t
-maili
n
fo when --rebasing
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: imp
l
ement --r
e
ba
s
ing mode
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l
Tan
builti
n
-am:
i
mplement -
-
3way
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
ca
c
he
-
tree: in
t
roduce wri
t
e
_
index_as_t
r
ee()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l
Tan
builtin-am: implem
e
nt -
s
/
-
-s
i
gnoff
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
builti
n
-am: e
x
i
t with user friendl
y
m
e
ss
a
ge on
failure
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
bu
i
l
t
in-am: implement -
q
/--quiet
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
bu
i
ltin-am: reject patch
e
s when th
e
re's a session in
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
bui
l
tin
-
am
:
im
p
lemen
t
--abort
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
ltin-a
m
:
i
mplem
e
n
t --
s
kip
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: don't parse mail
w
hen resum
i
ng
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement --res
o
lved/-
-
c
o
ntinue
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am:
r
efuse to a
p
ply patches
if ind
e
x is dirt
y
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
builtin-am: implement committing applie
d
patch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-a
m
: apply pa
t
ch with gi
t
-
apply
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
i
ltin-am:
extract p
a
tch a
n
d commit
info
w
ith git
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
builtin-am
:
a
u
to-
d
etect mbox patch
e
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-a
m
: split out
m
b
o
x
/
maildir
patches wit
h
git
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-a
m
: implement patch q
u
e
u
e mechan
i
sm
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builtin-a
m
: imple
m
ent s
k
eletal buil
t
in
a
m
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
T
an
wrapper: imple
m
ent xopen()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Pau
l
T
a
n
t3901: t
e
st
g
it-am encoding con
v
er
s
ion
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t3418: non-interactive
rebase --continue with rer
e
re
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
T
a
n
t4150:
t
est
s
for
a
m --[no
-
]scissors
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
a
ul
Tan
t4150: am wit
h
post-applypatch hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
a
ul Tan
t4150: am w
i
th pre-ap
p
lypatch hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
a
ul Tan
t4150: a
m
with ap
p
lypatch
-
ms
g
h
oo
k
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am --r
e
solved f
a
ils if index has unmerged entries
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am --resolve
d
fa
i
ls
i
f
in
d
ex has no changes
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am re
f
us
e
s
patches when paused
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Ta
n
t4151: am --abort
w
ill
keep d
i
rty i
n
d
e
x inta
c
t
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul T
a
n
t4150: a
m
fails
i
f
ind
e
x is d
i
rty
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-07
Paul Tan
t4150:
am
.
messageid r
e
ally
adds th
e
mess
a
ge id
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Pa
u
l
T
an
pull
:
r
e
move redirection to git-
p
u
l
l
.
sh
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul
Tan
pu
l
l --r
e
bas
e
: error o
n
no me
r
ge candidate cases
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull -
-
r
eba
s
e: exit early when the wor
k
ing directory
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: con
f
igure --rebase via bra
n
ch
.
<name>
.
re
b
ase
o
r
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Pa
u
l Tan
pull: teach git pull about --rebase
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Pau
l
T
a
n
p
ull: set reflo
g
messa
g
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
ull:
i
mplement
pulling
i
nto an
u
nb
o
rn
br
a
nch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul 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
pul
l
: check if
i
n unreso
l
v
e
d merge st
a
te
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Pau
l
T
a
n
pull: su
p
port pull
.
ff
c
onfig
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: error on no merge candidat
e
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: pas
s
git-fetch's options to git-f
e
tch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull: pass
gi
t
-me
r
ge's o
p
tions
t
o git-merge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pul
l
:
pass ver
b
osity,
-
-
progress fl
a
gs to fetch and
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull: implement fetch + merge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pul
l
:
i
m
pl
e
ment skeletal bu
i
ltin
p
ull
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
argv-array: implement argv_arra
y
_pu
s
hv(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l Tan
pars
e
-
o
p
tions-cb: impl
e
m
e
n
t par
s
e
_op
t
_passthru_argv()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
P
aul Tan
parse-options-cb: implement pa
r
se
_
opt_passt
h
r
u
()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
P
a
u
l Tan
am: tea
c
h
mercur
i
al patch
p
arser how
to
read f
r
om stdin
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
am: use gmtime()
t
o
parse mercurial patch
d
ate
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
t4150: test applying StGit serie
s
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
r
ead from stdin
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-12
Paul Tan
t0302: "un
r
eadab
l
e" test ne
e
ds SANI
T
Y p
r
ereq
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am --a
b
ort: ke
e
p unrela
t
ed commits
o
n unborn branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Pa
u
l
Tan
am --abort: support ab
o
rting
to
u
n
bor
n
branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Pa
u
l Tan
am --abort: revert chan
g
es int
r
oduced
b
y
f
ailed 3
w
ay
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Pa
u
l Tan
am --skip: suppor
t
s
k
ipping whi
l
e
on unborn branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
P
a
ul Ta
n
am -3: support
3
way me
r
ge on un
b
orn
branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
P
a
ul Tan
am --skip: re
v
e
rt changes introduced
b
y failed 3way
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
t
4150
:
test applying StGit patch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pull
:
use git-rev-
p
arse --parseo
p
t
for
option parsing
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pull: handle git-f
e
tch's options as well
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l Tan
t552
0
: check
reflog act
i
o
n
in
f
ast-f
o
rw
a
rd merg
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
P
aul Tan
t552
1
: test --dry-run d
o
es not make any changes
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
P
aul Tan
t5520: test --rebase
f
ailure on unborn
branc
h
with
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: test --rebase
w
ith mu
l
tiple br
a
nche
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
P
aul Tan
t
5
52
0
: t
e
s
t w
o
r
k
t
r
e
e fast-fo
r
w
ard when fet
c
h up
d
ates
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: tes
t
for failure if index has unresolved entries
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pu
l
l:
parse
p
ull
.
f
f as
a
b
ool or string
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Pau
l
Tan
p
u
ll: make
p
ull
.
ff=true
o
ve
r
ride merge
.
ff
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul
Tan
p
u
ll: handl
e
--l
o
g=<n>
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul
T
an
t5520
:
t
est no merge c
a
ndidates cases
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
t5520: prev
e
nt field
splitting in conte
n
t comparisons
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-14
P
a
u
l
Tan
pull: remove --ta
g
s
err
o
r in
n
o merge
candidates
case
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
path
.
c:
r
emove home_config_path
s
(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Pau
l
Tan
git
-
config
:
replace
u
se of home_config_paths()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Pa
u
l
Tan
gi
t
-commit:
replace use of home_config_paths()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
P
a
ul Tan
credentia
l
-store
.
c: re
p
lace h
o
me_
c
on
f
ig_paths
(
) with
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
dir
.
c
:
replace home_
c
onfig_paths(
)
with
xdg_config_h
o
me(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
P
aul Tan
attr
.
c: r
e
place home_config_p
a
ths() with xdg_config_h
o
me(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Pau
l
T
a
n
path
.
c: implem
e
nt xdg_config_
h
ome()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-31
Paul Ta
n
e
nter
_
re
p
o
(
)
:
fix docs to match cod
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Paul
T
an
t0302: test crede
n
t
i
a
l
-store suppor
t
for XDG_CONFIG_HOME
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Pau
l
Tan
git-credential-store: support X
D
G_CONFIG_H
O
M
E
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Paul Tan
git-credential-store: sup
p
ort multip
l
e
c
r
ed
e
ntial files
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree