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: handle stray state directory
2015-08-05
Pau
l
Ta
n
builti
n
-
am: han
d
le
stray s
t
ate directory
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
bui
l
ti
n
-am:
bypass g
i
t-mailinf
o
when --rebas
i
ng
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
bu
i
ltin-am: im
p
l
ement --r
e
basing mode
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am:
implement --
3
w
a
y
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
T
a
n
cache-
t
ree:
i
ntroduce write_index_as_tree()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
builtin-am: im
p
lem
e
nt -s/--signoff
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bui
l
tin-a
m
:
e
x
it
wi
t
h us
e
r friendly messag
e
o
n
failure
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
T
an
b
u
i
ltin-am: implement -q
/
--
q
uiet
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-am: reject pa
t
ches when
t
here's a se
s
sion in
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
iltin-am:
implem
e
nt --
a
bort
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
iltin-am:
i
m
p
le
m
e
nt --s
k
i
p
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
b
uiltin
-
am: do
n
't p
a
rse mail
when resu
m
ing
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builti
n
-am: implement --resolved/--continue
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builtin-am: refuse
to a
p
ply p
a
tches if
ind
e
x is dirty
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement co
m
mitting applied
patch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uiltin-am: apply p
a
tch with git-appl
y
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: extract
p
a
tch and commit info wit
h
git
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bui
l
tin-am:
a
u
to
-
det
e
ct mbox pa
t
ches
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
built
i
n-am: split
o
ut
mbox/maildir patches
w
ith
g
it
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l
Tan
builtin
-
a
m: imple
m
en
t
patch q
u
eue
m
ech
a
n
i
sm
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
i
ltin-am: imple
m
e
nt sk
e
letal
builtin
am
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
w
r
a
p
per
:
implement xfopen()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
wra
p
pe
r
:
im
p
leme
n
t xopen
(
)
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Ta
n
t39
0
1: t
e
s
t
git-
a
m encodi
n
g conver
s
ion
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t3418:
n
on-
i
nt
e
ractive rebase --contin
u
e wi
t
h
r
erere
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t41
5
0:
t
ests for am --[no-]scissors
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am with po
s
t-applypatch hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
P
a
ul
Tan
t4150: am wi
t
h
p
r
e-ap
p
lypa
t
ch hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
P
a
u
l Tan
t4150: a
m
with applypatch-msg hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
4
15
0
:
am --resolved fails if in
d
ex has unmer
g
ed ent
r
ie
s
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am -
-
resolved fail
s
i
f index has no c
h
a
nges
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l Tan
t4150: am
refuses patches when pa
u
sed
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4151: am --abort will keep dirty i
n
d
e
x intact
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am 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:
a
m
.
me
s
s
ag
e
id really adds
t
he me
s
sage id
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Pau
l
Tan
p
u
l
l
:
remove
r
e
dir
e
c
t
io
n
to g
i
t-pul
l
.
sh
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul
T
an
pul
l
--rebase: er
r
or on no merge c
a
n
d
idate cases
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
P
aul Ta
n
pull --rebase
:
e
xit early wh
e
n
the working dir
e
ctory
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul
Tan
pull: confi
g
u
r
e --rebase via branch
.
<name>
.
reba
s
e
or
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: teach git pull abo
u
t
-
-rebase
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull:
s
e
t
reflog mes
s
age
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: im
p
le
m
ent pulli
n
g into an u
n
born br
a
nch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: fast-forw
a
rd working t
r
ee
if head is updated
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
P
a
u
l
Tan
pull:
c
hec
k
if i
n
unres
o
lved merg
e
s
tate
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: support pull
.
ff confi
g
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul T
a
n
p
ull: error on no
m
erg
e
candid
a
tes
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul
Tan
p
u
ll
:
p
as
s
gi
t
-fetch's options to git-fetch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul
T
an
pull: pass git-m
e
r
ge's opt
i
ons
t
o
git-merge
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul T
a
n
p
ull: pass verbosity,
-
-progress fla
g
s
t
o
fetch
a
nd
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
P
a
ul
T
an
pull: implement fetch + merg
e
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull: implement skeletal builti
n
p
ull
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
Tan
argv-array: implement
a
rgv_array_pu
s
hv()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
T
an
parse-
o
ptions-cb: implement
p
ar
s
e_opt_pass
t
h
r
u_
a
rgv()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
parse-opt
i
ons-c
b
: implement p
a
rse_opt_passthru()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
a
m
: teach mercurial
p
atch parser how to read from stdin
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul
Tan
am: use gmt
i
me() to parse mercuri
a
l pa
t
ch dat
e
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
t4150: test applying StG
i
t series
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
am
:
teach
StGit p
a
tch pa
r
ser how
t
o
read from
s
tdin
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-12
Pau
l
Tan
t0302: "unreadable" t
e
st needs SANITY prer
e
q
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am
--
a
bort: keep unrelated commits on
unborn bran
c
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
a
m
--abort: support aborting
t
o un
b
orn branch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
P
a
u
l
Tan
am --abort: rev
e
r
t
c
h
an
g
e
s
introd
u
c
e
d b
y
failed
3
way
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul T
a
n
am
-
-
s
kip: support s
k
ipping
while on u
n
born
branc
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Ta
n
am -3: support 3way merge on unborn branch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am --skip:
revert chan
g
es introduced
by faile
d
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: u
s
e git-rev-parse --parseopt
f
or o
p
t
i
o
n
parsin
g
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pull:
h
a
ndle git-fetch's options as
w
e
l
l
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul T
a
n
t552
0
: chec
k
refl
o
g
action
in fast-fo
r
ward mer
g
e
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
P
a
ul
T
an
t5
5
21
:
t
e
st --dry-
r
un does not
make any changes
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l Tan
t
55
2
0
:
test --rebase
failure on
u
n
born branch with
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Ta
n
t5520: test --rebase
w
i
th multi
p
le
branches
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
P
aul T
a
n
t5520: test work
t
r
ee
fa
s
t-forward when fetch update
s
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
P
a
u
l
Tan
t5520:
t
e
s
t fo
r
failure if index has
un
r
esolve
d
entries
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull: parse pull
.
ff as a bool or
s
tring
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull: make
p
ull
.
ff=true override merge
.
f
f
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Ta
n
pull: handl
e
--log=<n>
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
t5520: test no merge
c
andidate
s
c
a
s
e
s
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Pau
l
Tan
t
5
520: prevent field splitting in co
n
tent comp
a
risons
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-14
P
aul Ta
n
pull: remove
--tags error in no
m
erge
c
andid
a
t
e
s case
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
p
at
h
.
c:
remo
v
e h
o
me_config_
p
aths()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
g
it-config: r
e
p
lace use of home_config_
p
aths()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
P
aul Tan
git-commit: repla
c
e use of
home_config_path
s
(
)
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul
T
an
credential-sto
r
e
.
c: replac
e
ho
m
e_
c
onfig_paths() with
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Pau
l
Ta
n
dir
.
c
: re
p
la
c
e home_config_paths() with xdg_co
n
fig
_
home
(
)
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
P
aul Ta
n
attr
.
c:
replace
h
ome_config_paths() w
i
th xdg_config_home
(
)
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul T
a
n
p
a
th
.
c:
imple
m
e
nt x
d
g_config_home()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-31
Paul Tan
e
n
ter
_
r
e
p
o(): fix d
o
cs to match
c
o
de
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-24
Paul Tan
t030
2
:
test cred
e
ntial-
s
tore
su
p
port
for XDG_
C
ONFIG
_
HOME
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-24
Pau
l
Tan
git-credenti
a
l-s
t
o
re: suppor
t
XDG_CONFIG_HOME
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-24
Paul Tan
g
i
t
-
c
redential-stor
e
: support
multiple
creden
t
ial files
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree