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
find_hook: keep our own static buffer
2015-07-20
Pa
u
l Tan
t3901:
t
e
st
git-am
encoding conver
s
ion
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Pau
l
Tan
t34
1
8: non-inte
r
a
ctive
r
eb
a
se
-
-continue with rerere
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
aul Tan
t4150: tests for a
m
--[no-
]
scissors
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l Tan
t4150: am with
post-appl
y
patch hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
Tan
t4
1
50: am with pre-app
l
ypa
t
ch hoo
k
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t41
5
0
:
am
w
ith a
p
p
l
y
patch-msg hook
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
a
ul T
a
n
t4150: am --re
s
olv
e
d fa
i
ls if index has un
m
erged entr
i
e
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
Ta
n
t4150:
a
m --resolved fails if i
n
d
ex has no changes
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
4150:
a
m refuses patches when paused
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
4151: am --abort will keep d
i
rty index
int
a
ct
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Ta
n
t4150:
a
m fails if
i
n
dex is dir
t
y
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-07
Paul Tan
t
4150: a
m
.
messageid reall
y
a
d
ds
t
he message id
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull:
r
emove re
d
irec
t
ion to git-pull
.
sh
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull
-
-reb
a
s
e
: error
on no mer
g
e candidate c
a
s
e
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull --rebas
e
: exit early whe
n
the wor
k
ing directory
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: configure --r
e
base
via
b
ra
n
c
h
.
<
n
am
e
>
.
r
e
b
a
se o
r
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul T
a
n
pull:
teach gi
t
pull
a
bout --reba
s
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: set reflog
m
e
ssage
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull
:
implement pulling into an un
b
o
r
n branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Pa
u
l T
a
n
p
u
ll: fast-forward working tree if head is updated
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul T
a
n
pull:
chec
k
i
f
in
u
n
r
e
solved m
e
rge s
t
ate
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul
T
a
n
pul
l
:
s
up
p
or
t
pull
.
ff con
f
ig
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Pa
u
l Tan
pul
l
: error on no merge candidates
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-18
Paul Tan
pull: pass git-fetch's options to
g
i
t
-
fetch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pul
l
: pass git-
m
erge
'
s opt
i
on
s
to git-merge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pull: pa
s
s v
e
r
bo
s
i
t
y
,
--pro
g
ress fl
a
gs to fetch and
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
P
aul Tan
p
ull:
i
mpl
e
men
t
fe
t
ch
+ merg
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
P
a
ul Tan
pul
l
: implement
s
keletal
bu
i
lt
i
n pull
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul
T
a
n
a
r
gv-a
r
ray: implement argv_array_pus
h
v()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pa
r
se-options-cb:
implement par
s
e_op
t
_
p
as
s
thru_argv()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
pars
e
-options-
c
b: implement parse_opt_p
a
sst
h
ru()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul
T
a
n
am: teach mercurial pa
t
ch parse
r
how to read
fr
o
m stdin
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Paul Tan
am: use
g
m
time() to parse mercu
r
ia
l
patch
date
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
Pa
u
l Ta
n
t4150: test apply
i
ng StGi
t
s
e
ries
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-15
P
aul Tan
am: teach StGit patch parser how to r
e
ad from stdin
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-12
P
a
ul Ta
n
t0302: "unreada
b
le" test nee
d
s SANITY pre
r
eq
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
P
a
ul Tan
a
m --abo
r
t
:
k
eep u
n
related
c
om
m
its on unborn br
a
nch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul
T
an
am -
-
a
bort: su
p
p
or
t
aborti
n
g to unborn bra
n
c
h
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Pa
u
l Tan
a
m --abort
:
revert changes introduced by failed 3way
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul T
a
n
am --skip:
s
upport s
k
ippi
n
g w
h
ile on unborn br
a
n
c
h
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am -3:
s
upport 3way
m
erge
on unborn branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul
T
a
n
a
m
--skip: revert changes introduce
d
by
f
a
i
led 3wa
y
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
P
a
ul Tan
t415
0
: test applying St
G
i
t patch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
Pa
u
l Tan
p
ull: use git-rev-pars
e
--parseo
p
t for o
p
t
i
on parsing
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul
Ta
n
pul
l
: handle git-fetch
'
s
op
t
ions as well
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t
5
520: check re
f
lo
g
action in fast-
f
orwar
d
merge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
P
a
u
l
Tan
t5521: test
--dry-run does not make any changes
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul
Tan
t5520: test --rebase failure o
n
u
n
b
orn branch with
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul T
a
n
t5520:
t
es
t
-
-
rebase with mult
i
pl
e
branches
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: t
e
s
t work
tree fast-forward when
fetc
h
updates
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
P
aul Tan
t5520: test for fail
u
re i
f
index has
u
nresolved
entries
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull: parse
p
ull
.
ff
as a bool
o
r string
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Pau
l
Tan
p
u
ll: ma
k
e
pull
.
ff=
t
rue override me
r
g
e
.
ff
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul
T
an
pull: handle --
l
og=<n>
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Ta
n
t
5520:
t
est no merge cand
i
da
t
es ca
s
es
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
t5520
:
prevent field split
t
ing
i
n co
n
tent
comparisons
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-14
Paul T
a
n
pu
l
l: re
m
ove --tags e
r
ror in no mer
g
e
candidates
c
ase
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
P
a
ul Tan
path
.
c: rem
o
ve home_co
n
fig_paths()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Ta
n
git-
c
onfig:
replac
e
use of home_config_paths()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
git-comm
i
t
:
replace use of home_config_paths
(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
credential-st
o
re
.
c: replace
home_conf
i
g_
p
aths() with
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Pa
u
l Tan
d
ir
.
c: re
p
lace home
_
conf
i
g_p
a
t
hs()
w
ith
x
dg_config_ho
m
e()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
attr
.
c
:
rep
l
a
c
e home_config_paths() with
x
dg_
c
onfig_h
o
me
(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
P
aul Tan
pat
h
.
c:
implement
x
dg_config_home()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-31
Paul
Tan
enter_repo(): fix d
o
cs to m
a
tch c
o
d
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Paul T
a
n
t0302:
t
est credential
-
store supp
o
rt for XDG_CONFIG
_
HOME
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Paul Tan
git-credent
i
a
l-store: support XDG_CONFIG_HOME
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Paul Tan
git-
c
redent
i
al-stor
e
:
s
u
pport multiple credential f
i
les
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree