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: implement --[no-]scissors
2015-08-05
Paul T
a
n
builtin-a
m
: implemen
t
--[n
o
-]sciss
o
rs
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
aul T
a
n
builtin
-
am: sup
p
ort --
k
e
e
p-cr, am
.
keepcr
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
a
n
builtin-am: im
p
l
e
m
ent --
[
no-]me
s
s
age-id
,
am
.
messageid
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bui
l
tin-am: implement
-k/--keep, --kee
p
-non-
p
atch
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-a
m
: handle stra
y
state direc
t
o
ry
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builtin-am: bypass git-mailinfo
when -
-
rebasing
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-
a
m: implement --re
b
asing mod
e
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builti
n
-am: imp
l
ement --3way
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
cache-tre
e
: introduce write
_
index_as_
t
ree()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bui
l
tin-am: implement -s/--signoff
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
bu
i
ltin-am:
exit w
i
th
u
ser friendly mes
s
age on fa
i
lure
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
bu
i
lt
i
n
-am: im
p
le
m
en
t
-
q/--
q
uiet
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Ta
n
bu
i
ltin-am: rej
e
ct
p
atches
when there's a session in
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
i
l
tin-am: implement --abort
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
b
u
iltin-am: impleme
n
t --sk
i
p
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
built
i
n
-am: don't parse mail w
h
e
n re
s
uming
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
iltin-am: implement
-
-resolved/
-
-cont
i
nue
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
bu
i
l
tin-am: refuse
to apply
p
atches if in
d
ex i
s
dirty
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uiltin-am: im
p
lement
c
ommitting applied pa
t
ch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bui
l
tin-
a
m: ap
p
ly patc
h
with git-apply
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: extract patch and c
o
m
m
i
t
i
n
fo with git
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-
a
m
:
aut
o
-detect mbox patches
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builtin
-
am: split out mbox/maildir patches wit
h
git
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-am: implement
p
a
t
ch queue mechanism
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builti
n
-
am: implement skele
t
al
b
u
iltin am
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
wrappe
r
: imp
l
ement
xfop
e
n
(
)
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
wrapp
e
r:
i
mpl
e
ment xopen(
)
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
P
aul Tan
t3901: test git-am encodin
g
conversion
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
P
a
u
l
Tan
t3418: n
o
n-intera
c
tive
reba
s
e --continue with rerere
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul
T
an
t415
0
: tests for am --[no-
]
scissors
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t41
5
0
:
a
m
with
p
os
t
-applypa
t
ch
h
ook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l Ta
n
t4150: am with pre-appl
y
patch
h
o
o
k
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am with
a
pplypatc
h
-m
s
g ho
o
k
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t415
0
: am --resolved
f
a
i
ls if in
d
ex
h
as
unmerged
entries
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Ta
n
t4150: am --resolved fails i
f
index has no
c
h
a
nges
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul
T
an
t4150
:
am refuses patches when pau
s
ed
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4
1
51: am
--abort will
k
eep dirty inde
x
intac
t
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul T
a
n
t4
1
50
:
am fai
l
s
if in
d
ex is dirty
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-07
P
a
u
l
Tan
t4150: am
.
mess
a
geid really ad
d
s the message id
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: remove redirec
t
io
n
to git-pull
.
sh
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull --rebase: erro
r
o
n
no merge candidate cases
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull --rebase
:
exit
e
a
rly when t
h
e working directory
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
P
aul Tan
pul
l
:
c
onfigure --reba
s
e
via bran
c
h
.
<name>
.
r
eb
a
s
e
or
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul T
a
n
pull: teach g
i
t
pull ab
o
ut --
r
ebase
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pu
l
l: set reflog message
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
u
ll: implement pulling into a
n
unborn
branch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: fast-f
o
rwar
d
wo
r
k
ing tree if head is updated
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul T
a
n
pull
:
check i
f
in unresolved merge state
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: support pull
.
f
f
config
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul T
a
n
p
ull: error o
n
n
o
m
erge candidates
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul T
a
n
pull: pa
s
s git-fetch'
s
options to git-fet
c
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
P
a
ul Tan
pull: pass
g
it-me
r
ge's options to git
-
me
r
g
e
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
p
ull: pass verbosity, --progress fl
a
gs to fet
c
h
and
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul
T
an
pul
l
: implement fe
t
c
h
+ merge
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l Ta
n
pu
l
l:
impl
e
ment skeletal builtin pull
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
argv-array: implement argv_array_pushv()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
P
aul T
a
n
par
s
e-opti
o
ns-cb: imp
l
ement p
a
rse_opt_
p
a
s
st
h
r
u_argv()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
parse-options-cb: i
m
ple
m
ent
p
ar
s
e_op
t
_passthru()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Ta
n
am: t
e
ach mercurial patc
h
parser how to
read from stdin
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul
Ta
n
am: use
gmtime() to p
a
rse mercurial p
a
tch date
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
P
a
ul T
a
n
t4150: tes
t
applying StGit s
e
ries
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
am: teach StGit patch parser how
t
o read 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
n
e
eds S
A
NITY p
r
ereq
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Pa
u
l Tan
am --
a
bo
r
t: keep unre
l
ated commits on unborn
branch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
P
aul Tan
am --abort: support aborting to unborn branch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Pau
l
Tan
am --abo
r
t: reve
r
t changes introduced by failed 3way
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Pau
l
Tan
am --
s
k
i
p
: suppo
r
t ski
p
ping while
o
n unborn
b
r
a
n
ch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
P
a
ul Tan
a
m -3: support
3way m
e
rge on unborn branch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
P
a
ul Ta
n
am --skip: revert
chan
g
es in
t
roduced by
f
ailed 3
w
ay
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
P
aul Tan
t4150: test a
p
p
l
ying
StGit patch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pull: use g
i
t-re
v
-parse -
-
parseopt for o
p
tion par
s
ing
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-02
P
a
ul Tan
p
u
ll:
h
andle git-fe
t
ch's
o
ptions a
s
well
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
P
a
ul
T
an
t552
0
: chec
k
r
e
flog
a
ct
i
on in fast-forward merge
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
P
a
ul
Tan
t5521: test --d
r
y-r
u
n does not
m
a
k
e any
c
hanges
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: t
e
st --r
e
base failure on unborn
b
ranch wit
h
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t55
2
0:
t
est
-
-re
b
ase with multi
p
le branche
s
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul T
a
n
t5520: tes
t
work
t
ree fast-forward wh
e
n fetch
u
pdates
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul
T
a
n
t
5
520
:
test for fa
i
lure if i
n
dex has
u
nre
s
olved entries
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Pa
u
l
Tan
p
u
l
l
:
pa
r
s
e
pu
l
l
.
ff a
s
a bool
or string
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
P
a
u
l
Tan
pull: m
a
ke pu
l
l
.
ff=true override mer
g
e
.
ff
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull: handle
-
-log=<n>
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Pa
u
l Tan
t5520: test no merge candidates case
s
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul
T
an
t5520: p
r
e
v
e
nt field splitting in content compari
s
ons
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-14
Paul
Tan
pull: remove --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_c
o
nf
i
g_p
a
t
h
s()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
git-config: replace
u
s
e of home_con
f
i
g
_
p
aths()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
git-commi
t
: replace use of home_c
o
nfig_paths()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
credential-store
.
c: replace home_config_paths(
)
with
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
dir
.
c:
replace h
o
me_config_
p
a
t
hs() with xdg_config_home()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
att
r
.
c: replace h
o
m
e
_config
_
paths()
with xdg_co
n
fig
_
h
o
me()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
path
.
c: imp
l
ement xdg
_
config
_
home()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-31
Paul T
a
n
e
n
ter_repo
(
): fix docs to match code
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-24
Paul Tan
t0302: t
e
st creden
t
ial-store s
u
p
p
ort fo
r
XDG_CONF
I
G_HOM
E
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-24
Pa
u
l Tan
git-c
r
e
dential-store: support XDG_CONFIG_
H
OME
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-24
Paul T
a
n
git-credential-store: support
multiple crede
n
tial files
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree