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: support --keep-cr, am.keepcr
2015-08-05
Pau
l
T
a
n
builti
n
-am: suppor
t
--keep-cr,
am
.
k
eepcr
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement
-
-[no-]message-id, am
.
message
i
d
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
ltin-am:
i
mplement
-k/--keep, --keep-non-
p
atch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
bu
i
ltin-am
:
implement -u/
-
-ut
f
8
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-a
m
:
handle stray state directo
r
y
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: bypass g
i
t
-
m
a
ilinfo when --rebas
i
ng
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builtin-am: implement --rebasing mode
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul T
a
n
buil
t
in-am: impl
e
men
t
--3way
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
cache-tree: int
r
o
duc
e
w
r
i
t
e
_inde
x
_as_tre
e
()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implemen
t
-s/--
s
i
g
noff
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
buil
t
in-am
:
exit with
u
s
er frien
d
ly message on
f
ailure
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Ta
n
bu
i
ltin-am: impl
e
ment
-
q/--quiet
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul T
a
n
bu
i
l
tin-am: reject p
a
tches wh
e
n there's a session in
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
buil
t
in-am: im
p
l
ement --abo
r
t
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builtin-am: impl
e
ment --skip
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: d
o
n't parse mail when r
e
suming
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin-am: implement --r
e
solved/--continue
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
buil
t
i
n
-
a
m: refu
s
e to apply
p
atc
h
es i
f
i
n
dex i
s
dirty
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
b
uiltin-a
m
:
implem
e
nt commit
t
ing applied patch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Ta
n
builtin
-
a
m
: apply patch
with gi
t
-apply
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builtin-am
:
ext
r
act patch and commit
i
nfo with git
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
buil
t
in-am: aut
o
-detect mb
o
x patches
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
builtin-
a
m: s
p
li
t
out mbox/maildir
patc
h
es with git
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
a
n
buil
t
in-am: implement patch queue mechanism
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am:
impl
e
me
n
t s
k
ele
t
al
builtin
am
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
wr
a
ppe
r
:
i
m
plement xfopen(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
wrappe
r
: implement xopen()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
3901: test git-
a
m encoding co
n
ve
r
si
o
n
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t3418: no
n
-interac
t
ive
r
ebase --c
o
nt
i
nue with re
r
ere
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
4
150: tests for am --[no-]
s
cis
s
ors
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Ta
n
t415
0
:
am w
i
th p
o
st-apply
p
at
c
h hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
Tan
t41
5
0: a
m
wi
t
h pre-a
p
plypatch hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
T
an
t
41
5
0: am with applypatch-msg hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t41
5
0: am --re
s
olved fails if inde
x
has un
m
erg
e
d entri
e
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
4
150: a
m
-
-
r
esolved fails if in
d
ex has
no
c
hanges
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t41
5
0:
am refuses
p
a
tches wh
e
n
pa
u
sed
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
T
an
t415
1
: am --abort will keep dirty in
d
e
x
intact
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
aul Tan
t
4
150
:
am fails if
i
n
dex i
s
dirty
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-07
Paul Tan
t
4150: am
.
messagei
d
r
eally adds the
messag
e
id
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: remove redir
e
ction t
o
git-pull
.
s
h
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Pa
u
l
Ta
n
pu
l
l --rebase:
er
r
o
r
on no merge candidate ca
s
es
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul
T
an
pull --
r
eba
s
e: exit e
a
rly when the
w
orking directory
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: configure --rebase
v
ia branch
.
<name>
.
rebase or
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
P
aul Tan
pu
l
l: teach git
p
ull abou
t
--rebase
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Ta
n
p
ull
:
set reflog mes
s
age
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: implement pulling into an unborn
branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
P
aul
T
an
p
ull: fast
-
f
o
rward wor
k
ing
t
ree if head is up
d
ated
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: check
i
f
in unresolv
e
d merge state
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: sup
p
ort pull
.
ff config
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul
Tan
pull: error on no
m
erge
c
andidates
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
P
a
ul Tan
pu
l
l
:
pas
s
git-fetch's opti
o
ns t
o
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
g
it-merge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l T
a
n
pul
l
:
pa
s
s verb
o
si
t
y, --p
r
o
gre
s
s f
l
ags to f
e
tch and
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul
T
an
pull: im
p
lement fetch + merg
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull: i
m
plement sk
e
letal builtin pull
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul
T
an
a
rgv-arra
y
: impleme
n
t
argv_array_pushv()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
parse-options-cb: implemen
t
parse_opt_p
a
ssthru_a
r
gv()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
parse-options-cb: imple
m
ent parse_o
p
t_passthru()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Ta
n
am: teach merc
u
ria
l
p
a
tch parser
how to rea
d
fro
m
s
t
din
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
am
:
us
e
gmtime() to par
s
e m
e
rcurial
p
a
tch
d
ate
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
t415
0
: te
s
t applying StGit s
e
r
i
es
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l T
a
n
a
m: teach St
G
it
p
atch parser how to r
e
ad from stdin
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-12
Pa
u
l Tan
t0302
:
"unreadable"
t
est needs SA
N
I
T
Y
p
r
e
req
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
a
m
-
-abort: keep unrelat
e
d
commits
on unborn
branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Pa
u
l
Ta
n
am --abort: support aborting to
unbo
r
n branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Pau
l
Tan
a
m
--abort: revert cha
n
ges
introduced by fa
i
l
e
d 3way
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Pa
u
l Ta
n
am --skip
:
support skipp
i
ng
w
hile on unborn br
a
nch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am -3: sup
p
ort 3way merge o
n
unbo
r
n
b
ranch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am --skip: revert changes in
t
roduced by fai
l
ed 3way
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Pau
l
Ta
n
t4150:
te
s
t
a
pplyi
n
g
StGit pat
c
h
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pull: use
g
it-rev-p
a
rse --parseopt for op
t
ion parsing
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pull: handl
e
git
-
fetch's options as well
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Ta
n
t5520
:
check
refl
o
g action in
fast
-
f
o
rward merge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5
5
21: t
e
st --dry-run
does no
t
make
any changes
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: test --rebase fai
l
ure o
n
unbo
r
n
branch wit
h
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Ta
n
t552
0
: test --rebase with m
u
ltipl
e
branc
h
es
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: test wo
r
k tree fa
s
t-fo
r
w
a
rd whe
n
fetch update
s
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: te
s
t f
o
r f
a
ilure if index has unresolve
d
e
n
tries
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pul
l
:
parse pull
.
ff as a bool
or strin
g
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pul
l
: mak
e
pull
.
ff=
t
ru
e
ove
r
r
id
e
merge
.
ff
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul
T
an
pu
l
l: handle
-
-log=<n>
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul
T
a
n
t5520: test no m
e
rge can
d
idates c
a
se
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
P
aul
Tan
t55
2
0: pre
v
ent field splitti
n
g in content c
o
mparisons
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-14
Paul
T
an
pull: remove --tags
e
rror in no merg
e
c
a
ndidates case
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
path
.
c: remove h
o
me_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 home_config_paths()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul
T
an
git-
c
ommit: repla
c
e use of h
o
me_config_paths()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
credent
i
al-store
.
c: r
e
place home_config_
p
aths
(
) with
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul T
a
n
di
r
.
c
: replace home_config_pa
t
hs(
)
w
i
th xdg_config
_
home()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
attr
.
c: replace
h
ome_config_paths() with xd
g
_config_home()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul
Ta
n
p
a
t
h
.
c: implement xdg_config_home()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-31
Paul Tan
e
nter_repo():
fix
d
ocs to match code
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Paul
T
an
t0302: test cr
e
dential-store support for XDG_CONFI
G
_
HOME
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Paul Tan
git-credenti
a
l
-
store:
s
u
pp
o
rt XD
G
_CONFIG_HOME
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Paul Tan
g
i
t
-
credential-store: s
u
pport mult
i
p
l
e cre
d
enti
a
l files
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree