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 --rebasing mode
2015-08-05
Pa
u
l Tan
builtin-a
m
: im
p
lement --rebasing mod
e
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
il
t
in-am: imp
l
ement --3
w
ay
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
cache-tree: introduce
w
rite_
i
nde
x
_as_tree()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
buil
t
in-am: imple
m
e
nt -s/--signof
f
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: exit with user
friendl
y
message
o
n
fa
i
l
u
re
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: impleme
n
t -q/--qui
e
t
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l Tan
builtin-
a
m: reject patches when
th
e
r
e's
a session in
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
lt
i
n-a
m
: imp
l
eme
n
t --
a
bort
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement --skip
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
b
u
iltin
-
a
m
: don't parse mail whe
n
resuming
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: imple
m
ent --
r
esolved/--continue
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
buil
t
in-am: refu
s
e to appl
y
patches if
index is dirty
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
T
a
n
b
u
ilti
n
-am
:
implement c
o
mmitting
a
pplied pat
c
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n
-am:
a
pply patch wi
t
h
git-ap
p
ly
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin-am: ex
t
r
a
ct patch and com
m
it inf
o
with gi
t
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
iltin-a
m
: au
t
o-detect mbox patches
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul
T
an
buil
t
in
-
am: spli
t
out mbox/maildir patch
e
s with git
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
bu
i
lt
i
n-am: imp
l
emen
t
p
atch queu
e
mec
h
anism
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement
skelet
a
l
builtin am
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
wrapper: impleme
n
t xfope
n
()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul
T
an
wrapper: impl
e
ment xopen
(
)
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t3901: test git-a
m
encoding co
n
version
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Ta
n
t3
4
18: non-interactive reba
s
e
--
c
o
ntinue with rerere
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150:
tests
f
or
am
-
-[n
o
-]scisso
r
s
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4
1
5
0
: am
w
i
t
h
post-applypa
t
ch hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l
Ta
n
t415
0
:
am with pr
e
-applypa
t
ch hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150:
am w
i
th applypat
c
h-
m
sg hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t41
5
0:
a
m --re
s
o
lv
e
d fails
i
f index
has
u
nmerged
e
ntries
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l T
a
n
t4150: am --resolved fails
i
f
index ha
s
no changes
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l Ta
n
t4150: am
refuses pa
t
che
s
when paused
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t41
5
1: am --abort w
i
ll keep
dirty index i
n
t
a
ct
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am fails if index is dir
t
y
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-07
P
a
ul Tan
t4150:
a
m
.
m
e
ssageid really adds
t
he
m
ess
a
ge id
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pu
l
l: r
e
move red
i
rection to git-pull
.
sh
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul
Tan
pull
-
-reba
s
e: error o
n
n
o
merge candidate cases
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul
T
an
pull -
-
rebase: exit e
a
rly when the working directory
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
P
a
ul Ta
n
p
ull: con
f
ig
u
re --rebase via branch
.
<n
a
me>
.
rebase or
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pu
l
l
:
teach git pull abou
t
--rebase
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: se
t
r
e
flog message
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull
:
implem
e
n
t
pullin
g
into a
n
u
n
born bran
c
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: fast-
f
o
rward worki
n
g tr
e
e if head
i
s updated
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull:
chec
k
if
i
n
unresolved
m
erge state
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
P
a
ul Tan
pull: support pu
l
l
.
ff conf
i
g
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull:
error on
no
m
e
r
g
e candidates
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull:
pass git
-
fetch's option
s
to git-fetch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l Tan
pull: pass git-
m
erge's options
t
o
git-merge
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul
T
an
pu
l
l: pass verbosi
t
y, --pr
o
gr
e
s
s flags t
o
fe
t
ch
a
nd
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul
Tan
p
ull:
i
mplement
f
etch
+ merg
e
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
P
aul Tan
p
ull: i
m
p
lement skeletal built
i
n p
u
l
l
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
argv
-
a
rr
a
y: implem
e
n
t argv_array_pushv()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
Tan
parse-opti
o
ns-cb: implement parse_opt_p
a
s
sthru_argv()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
p
a
rse-option
s
-c
b
: implement
p
arse_opt_passthru
(
)
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l Tan
am: teach
m
ercurial patch p
a
rser
h
ow to rea
d
from
stdin
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul
Tan
a
m
: use gmtime() to parse mercurial patch
d
ate
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
t4150: test applying
S
tGit series
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
am
:
teach St
G
it patch p
a
rser how
t
o read from stdin
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-12
Paul Tan
t0302:
"
u
nreadab
l
e"
t
est needs
S
ANITY prereq
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am --ab
o
rt: ke
e
p unrelated c
o
m
m
its on unbor
n
branch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
a
m --abort:
s
u
pport aborting to unborn branch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am --abo
r
t: re
v
ert changes
i
n
troduced
b
y failed
3
way
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am --ski
p
:
s
upport
skippi
n
g while on unborn b
r
anch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am -3: suppor
t
3way
m
erge on unborn branc
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Pau
l
T
an
a
m --skip: revert chang
e
s
introduce
d
by fail
e
d 3
w
a
y
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
t
41
5
0: t
e
st
a
p
p
lying
S
t
G
it p
a
tch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pu
l
l: use git-rev-parse --parseopt
f
or option parsing
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pul
l
: handl
e
git-fetc
h
's options as w
e
ll
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
P
aul
T
an
t5520: c
h
ec
k
reflo
g
action in fas
t
-forwar
d
merg
e
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
P
a
ul Tan
t5521: test --dry-run d
o
es not
m
ake
an
y
changes
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
P
a
u
l
Tan
t
5520: test
-
-rebase
f
ailure
on unborn b
r
an
c
h wit
h
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t
5520: test
-
-rebase with multiple branch
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
o
rwar
d
wh
e
n fetch
updates
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l
Ta
n
t5520: te
s
t
for failure if index
h
a
s unresolved e
n
tries
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull: pa
r
se pull
.
ff
a
s a bool or string
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul T
a
n
pull:
m
ake
pull
.
ff=tru
e
override mer
g
e
.
ff
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Ta
n
p
u
ll: hand
l
e -
-
lo
g
=<n>
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul T
a
n
t
5
52
0
: test no merge
candi
d
a
t
es c
a
ses
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Ta
n
t5
5
20: pr
e
v
e
n
t field splitting in content com
p
a
r
is
o
ns
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-14
Paul T
a
n
pull: remove --tags err
o
r in no me
r
ge c
a
n
d
id
a
tes case
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
path
.
c: remove home_conf
i
g_paths()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
git-config: replace
use
of h
o
me_
c
o
nfi
g
_
paths(
)
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
g
i
t-com
m
it: replace use of home_config
_
path
s
()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
credentia
l
-st
o
re
.
c: replace
hom
e
_c
o
nfig_paths() w
i
th
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
P
a
ul T
a
n
dir
.
c: re
p
l
a
ce hom
e
_config_paths() with
x
dg_conf
i
g_hom
e
(
)
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul
T
an
attr
.
c: r
e
pl
a
ce h
o
me_config_paths
(
) with x
d
g
_
config_home()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
pat
h
.
c
:
implement x
d
g_config_hom
e
(
)
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-31
Paul Tan
enter
_
repo
(
)
:
fix docs to m
a
tch
code
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-24
Pa
u
l Tan
t0302:
t
est
c
re
d
en
t
ial-store suppo
r
t fo
r
XDG_CONFIG
_
HOME
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-24
Pa
u
l
Tan
git-creden
t
ial-store: support XDG_CONFIG
_
HOME
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-24
Paul
T
an
git-credential-store
:
support multipl
e
c
r
ed
e
ntial files
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree