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: implement -k/--keep, --keep-non-patch
2015-08-05
Paul
Tan
built
i
n
-a
m
: implemen
t
-
k
/
--ke
e
p
,
--
k
e
e
p-n
o
n
-patch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
bu
i
ltin-am: i
m
plement -u/--utf8
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
aul
T
an
builtin-am: ha
n
dle st
r
ay s
t
ate direct
o
ry
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: bypa
s
s git
-
m
aili
n
fo when --rebasing
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
ltin-am: impl
e
ment --r
e
basing mo
d
e
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin-am: implemen
t
--3way
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
cache-tree:
i
ntro
d
uce
write_in
d
ex_as_tree()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uiltin-am: imp
l
e
m
ent -s/
-
-signoff
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
builti
n
-am: e
x
it with user friendly
message
o
n fa
i
l
u
r
e
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am:
implement -
q
/
--quiet
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
b
u
iltin
-
am: reject patches
w
hen there's a session in
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l
Tan
buil
t
in-am:
implemen
t
--
a
bort
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
T
a
n
b
u
iltin-am: im
p
lement --skip
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
builtin-am: don't parse mail when
r
es
u
ming
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin-am: implement --resolved/-
-
continue
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uiltin-am: refuse to apply patches if i
n
dex is dirty
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement c
o
mmitting
applie
d
patc
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Ta
n
builtin
-
am: ap
p
ly patch with git-apply
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
built
i
n-
a
m: extract patch and commit info
with
git
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
aul
T
an
builtin-am: a
u
t
o
-detect mbox patches
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
iltin-am: split out mbox/m
a
ildir patches wit
h
git
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
iltin-am: i
m
plem
e
nt patch queue mec
h
anism
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
buil
t
i
n-am: implement
s
keletal
b
u
iltin a
m
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
wra
p
pe
r
:
imp
l
eme
n
t
xfopen
(
)
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l Tan
wr
a
pper: implement xopen()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
P
a
ul Tan
t3901: test git
-
am encodin
g
conversion
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t3418:
n
on-interact
i
v
e
r
ebase --
c
ontinue wit
h
rerer
e
.
.
.
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
t4150: am with po
s
t-app
l
y
patc
h
hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
415
0
: am w
i
th pre-app
l
y
p
atch
h
ook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul T
a
n
t4150:
a
m with applypatch-m
s
g hook
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am --re
s
olve
d
fails if index has unmerged entries
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l Tan
t4150: am
-
-resolved
fails
if index has no changes
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am r
e
f
us
e
s patches wh
e
n paused
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4151:
a
m --
a
bor
t
w
ill keep dirty index intact
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am fails if
i
ndex is di
r
ty
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-07
Paul Tan
t4150: am
.
messageid really ad
d
s th
e
message id
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: remove redi
r
ection to g
i
t
-pull
.
sh
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Ta
n
pull --re
b
a
se: e
r
ror on no
mer
g
e ca
n
did
a
te cases
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Pau
l
Tan
p
ull
-
-
rebase: exit early when the working di
r
ectory
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
P
a
ul Tan
pull: configur
e
--reb
a
se via branch
.
<na
m
e>
.
r
ebase or
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
p
u
ll: teach git
p
ull abou
t
--rebase
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
T
an
pull: implement pullin
g
into an unborn branch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul
T
an
pu
l
l: fast-forward wo
r
king t
r
ee
if h
e
ad is upd
a
ted
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pul
l
:
check if in unresolved
merge sta
t
e
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: s
u
pport pull
.
ff con
f
ig
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul T
a
n
pul
l
: error on
no
merge candid
a
te
s
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-18
Paul
Tan
pull: pass git-fe
t
ch'
s
op
t
ions to git-fe
t
ch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
P
aul Tan
pu
l
l: pass git-merge's options
t
o g
i
t-mer
g
e
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul T
a
n
pull: p
a
s
s
verbo
s
i
t
y,
-
-progress f
l
ags t
o
fet
c
h
and
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul
Tan
pull
:
implement fetch + m
e
r
g
e
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
P
a
u
l
T
an
pull: implement skele
t
al built
i
n pull
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
argv-array: im
p
lement a
r
gv_array_pushv()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
Tan
parse-
o
ption
s
-cb: implement
p
arse_op
t
_passthru_argv()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
parse-options-cb: implement parse_opt_passthru()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
a
m: t
e
ach me
r
curial patch parser how t
o
read
f
r
o
m
s
t
din
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul
T
an
a
m: use gmtime() t
o
parse me
r
curial patch date
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
t4150: te
s
t
applyi
n
g StGit series
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-15
Paul
T
an
am: teach StGit patch parser
h
ow to read f
r
om
stdin
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-12
Paul Tan
t
0
302: "unreadable" test needs SANITY prereq
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
P
a
u
l
Tan
am --abort: keep unrelat
e
d com
m
its
on
u
nborn branc
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Pa
u
l Ta
n
am
-
-abort: support aborting t
o
unborn
b
ranch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
P
a
ul
T
an
am --abort: reve
r
t
c
h
a
nges introdu
c
ed b
y
fai
l
ed 3way
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
P
a
u
l
T
a
n
am --skip: support
s
kipping whil
e
on unborn b
r
anc
h
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
a
m -3: support 3way merge on
u
nb
o
rn branch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul T
a
n
a
m
-
-
s
kip: revert
changes introduc
e
d by failed 3way
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul
Ta
n
t4150: test ap
p
lying
S
tGit patch
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-02
Pa
u
l Tan
pull: use git-rev
-
p
a
r
s
e
--parseopt fo
r
o
p
tion parsing
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pull: handle
git-fetch's
options as well
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520:
c
heck
r
eflog ac
t
ion in fast-forward merge
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Pau
l
Tan
t5521: test -
-
dry-run do
e
s n
o
t make an
y
changes
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Ta
n
t5520
:
t
es
t
--rebase
f
ailu
r
e on
u
nbor
n
branch wit
h
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul
Tan
t5520
:
test
--rebase with m
u
ltipl
e
branch
e
s
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
P
aul
T
an
t5520: test work
t
ree f
a
s
t
-
f
orwa
r
d when fet
c
h updates
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul
T
an
t5520:
t
e
s
t fo
r
fa
i
lure i
f
index has unr
e
s
olved
entries
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
P
aul Tan
p
u
ll: parse pull
.
ff as a bool
o
r string
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull
:
make pull
.
ff=t
r
u
e ove
r
rid
e
mer
g
e
.
ff
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Pau
l
Tan
pul
l
: handl
e
-
-log=<n>
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
P
a
u
l Tan
t
5
520: test no merge candi
d
a
tes c
a
ses
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul
T
an
t5520: prevent field
s
plitting in content
co
m
parisons
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-14
Pa
u
l Tan
p
ull: remov
e
--
t
ags
error in no m
e
rge candidat
e
s case
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul T
a
n
path
.
c: remove home_config_paths()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
git-config: replace u
s
e of home_
c
onfig_path
s
()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
git-
c
ommit:
replace use of home
_
config_pat
h
s(
)
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
credential-stor
e
.
c: replace home_co
n
fig_pat
h
s() w
i
t
h
.
.
.
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
P
a
ul T
a
n
dir
.
c:
replace home_confi
g
_pa
t
hs()
w
ith xdg_config_home()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul T
a
n
attr
.
c: repla
c
e
ho
m
e
_
config_paths() with
x
d
g
_config_home()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-06
Paul
Tan
path
.
c:
implem
e
nt x
d
g_config_hom
e
()
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-31
Paul
T
a
n
enter_repo(): fix
docs to match code
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-24
Paul Ta
n
t0302: te
s
t credentia
l
-store sup
p
ort for XDG_CONFIG_HOME
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-24
Paul Tan
git-credential
-
s
tor
e
: su
p
p
ort XDG
_
CONFIG_HOM
E
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree
2015-03-24
Paul
T
an
g
it-cre
d
ential-store: support multiple credenti
a
l
f
iles
Signed-off-by: Paul Tan <
pyokagan@gmail.com
>
commit
|
commitdiff
|
tree