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: bypass git-mailinfo when --rebasing
2015-08-05
Pa
u
l Tan
bui
l
tin
-
am:
bypass git-mailinf
o
when --rebasi
n
g
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-
a
m:
i
mplem
e
nt -
-
r
e
basin
g
m
o
d
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
builtin-am
:
im
p
l
e
ment --3way
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
c
ache-tree: introduce
w
rite_in
d
ex_a
s
_tree()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: imp
l
emen
t
-s/--signo
f
f
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builtin-am: exit w
i
th user f
r
iend
l
y
m
ess
a
ge on failure
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
iltin-am: implemen
t
-q
/
--quiet
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
b
u
i
ltin-am
:
reje
c
t patches
w
hen there's a session in
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
buil
t
in-am: i
m
plement
-
-
a
bort
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul T
a
n
builti
n
-am: imp
l
e
m
ent --skip
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builtin-am: don't
parse mail
w
hen resu
m
ing
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin
-
am: implement
-
-reso
l
ved/--continue
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
buil
t
in-am: r
e
f
u
se to apply p
a
tches if i
n
dex
i
s
dirty
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
bu
i
lti
n
-a
m
: implemen
t
comm
i
tting applie
d
patch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l
Tan
builtin-am: apply patch wi
t
h g
i
t-ap
p
ly
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n
-
am: extract patch and commit info w
i
th git
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
bui
l
t
in-am
:
auto-detect mb
o
x patches
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin
-
am: split out m
b
o
x
/m
a
ild
i
r pat
c
h
e
s with git
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin-am: imple
m
ent patc
h
queue mech
a
nism
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
i
ltin-a
m
: implement skel
e
tal
b
uiltin am
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
wrapper:
i
mple
m
e
n
t xfope
n
()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
wrapp
e
r: implement x
o
pen()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
3
901: test g
i
t
-
a
m
enc
o
ding c
o
nv
e
rsion
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t34
1
8: non-int
e
ractive re
b
ase --
c
ontin
u
e with re
r
ere
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
aul Tan
t4150: tests for am -
-
[no-]scissors
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
T
a
n
t4150: am w
i
th post
-
applypatch hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul T
a
n
t4150: am
with pre-
a
p
plypatch hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am with applypatch-msg
h
ook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
aul Tan
t4150: am --r
e
solved fails
i
f inde
x
has unmer
g
ed ent
r
ies
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
a
u
l
Tan
t4150: am
--resolved fai
l
s if in
d
ex ha
s
no changes
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150
:
am r
e
fuses patches when pa
u
se
d
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
4151:
am --abort
w
ill keep dirt
y
index intact
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
Paul Tan
t4150:
a
m
.
message
i
d really ad
d
s t
h
e
m
essage
id
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul T
a
n
pull: re
m
ove redirection to git-pull
.
sh
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Pa
u
l Ta
n
pull --r
e
base
:
e
rror on no merge candidat
e
cas
e
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Pau
l
Tan
pull --rebase:
e
xit
e
arly when the
working dire
c
tory
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
P
a
ul Tan
p
ull: c
o
n
f
i
g
ure --rebase via bra
n
ch
.
<n
a
me>
.
rebase
or
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
P
a
u
l
Tan
pull: tea
c
h
g
i
t pull about --rebase
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Pau
l
Tan
pull: set reflog message
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: i
m
pleme
n
t pulling into
an unborn
b
ranch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
P
aul Tan
pull: fast-fo
r
ward working tree
i
f head is updat
e
d
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Pau
l
Tan
pull: check if in unresolved merge state
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull
:
supp
o
r
t
pul
l
.
f
f
config
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: erro
r
on no merge can
d
id
a
tes
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pu
l
l: pas
s
git-fetch's opt
i
ons to git-f
e
t
ch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
P
a
ul Tan
pull
:
pass git-merge's options to git-merge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull
:
pa
s
s
verbosity,
--progress flags t
o
fetc
h
and
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul
T
an
pull: implemen
t
f
e
t
ch + merge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Ta
n
pull:
i
mplement skel
e
tal builtin pull
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
argv
-
array: imp
l
eme
n
t argv_array_
p
ushv()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Pau
l
Tan
parse-options-cb: implement parse_opt_pa
s
sthru_arg
v
()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul
Tan
pa
r
se-options-cb: implem
e
nt pa
r
se_op
t
_passthru()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
am: teach
m
e
rcurial
p
atch parser
h
ow to read from s
t
d
in
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
am: use gmtim
e
(
)
t
o pa
r
se
m
e
r
curial patch d
a
t
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
t4
1
50: te
s
t apply
i
ng StGit s
e
ri
e
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
am: teach StGit patch parser how to re
a
d
fr
o
m
s
t
d
in
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-12
P
aul Ta
n
t
0
302: "un
r
eadable
"
test n
e
eds SANITY prereq
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
a
m --abort:
keep unrelated com
m
its on unborn branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am --abo
r
t: support aborting to unborn
b
ranch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am --abort: revert changes introduced by failed 3wa
y
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul T
a
n
a
m
--skip: sup
p
ort
skipp
i
n
g
while on unborn branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
P
aul
T
a
n
am
-3: s
u
pport 3way me
r
g
e
o
n unborn branc
h
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul
Tan
am --s
k
ip: revert c
h
anges intro
d
uce
d
by fa
i
led 3w
a
y
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul T
a
n
t4150:
test apply
i
ng StGit patch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
P
aul Tan
pu
l
l: use gi
t
-rev-parse --parseop
t
for option
p
arsing
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pull
:
handle
g
i
t
-fetch's
op
t
ions as wel
l
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
P
a
u
l
Tan
t5520: check reflog action in
f
ast-forwar
d
merge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
P
a
ul Tan
t5521: test --dry-run does
n
ot make any changes
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: t
e
s
t
-
-
r
e
b
a
se f
a
ilure on u
n
born
b
ranc
h
wi
t
h
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
P
a
ul Tan
t5520: test --reb
a
se
w
ith
m
u
l
tipl
e
br
a
nches
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l
Tan
t5
5
20
:
tes
t
work tree fast-forwar
d
when
fetch
updates
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
P
a
ul Tan
t55
2
0:
t
e
s
t for fa
i
lu
r
e if index
h
as unres
o
lved entries
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Ta
n
pu
l
l: parse pul
l
.
ff
as 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=true ov
e
rride merge
.
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
Paul Tan
t5520: test no
merge
candidates c
a
ses
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
t5
5
20:
prevent field spli
t
t
i
ng in content compa
r
iso
n
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-14
Paul
Tan
p
u
l
l: remove --tags erro
r
in no me
r
ge candi
d
ates cas
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul
T
an
pa
t
h
.
c: rem
o
ve home_config_paths()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Ta
n
g
i
t-co
n
fi
g
:
rep
l
ace
use of home_config_paths()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Pau
l
Tan
git-
c
ommit:
r
eplace use of home_co
n
fi
g
_paths()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
credenti
a
l
-store
.
c: re
p
lace h
o
m
e
_co
n
fig_
p
aths() with
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
P
a
u
l Tan
d
i
r
.
c
: replace home
_
config_paths() with
xdg_confi
g
_home()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Ta
n
a
t
tr
.
c: replace home_con
f
ig_paths() w
i
t
h
xdg_c
o
nfig_
h
om
e
()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
P
a
ul Tan
path
.
c:
implement xd
g
_co
n
f
i
g
_
h
ome()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-31
Paul Tan
enter_repo(): fi
x
d
ocs to match code
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
P
a
ul Ta
n
t0302: test credential-store s
u
ppor
t
for XDG_CO
N
F
I
G_
H
OME
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
P
a
ul
T
an
git-credential
-
store: s
u
pport X
D
G_CONFIG_
H
O
ME
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Paul Tan
git-cred
e
ntial-st
o
re: support multiple credential files
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree