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
t4150: am --resolved fails if index has unmerged entries
2015-07-20
P
aul Tan
t415
0
: am --resolved fa
i
l
s if in
d
ex
has unmer
g
ed entries
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
aul Tan
t4150: am
--
r
es
o
lved
fai
l
s if index ha
s
no changes
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am refuse
s
pa
t
ches when paused
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
P
aul
T
an
t
41
5
1: am --abor
t
wi
l
l keep dirty index intact
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
4150: am f
a
il
s
if index
i
s
dirty
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-07-07
Paul Tan
t415
0
: am
.
messageid reall
y
adds the m
e
ssage id
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-12
Paul Tan
t0302:
"
unrea
d
able
"
test needs SANITY prereq
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
P
a
ul Tan
am --abort: ke
e
p unrelated com
m
i
ts on
u
nbo
r
n b
r
anch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
P
aul Tan
am --
a
bort:
suppo
r
t abort
i
ng to
unborn br
a
nc
h
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
P
aul Tan
am -
-
abort:
r
evert c
h
a
n
ges
i
ntroduced by faile
d
3way
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
a
m -
-
skip: s
u
pport skippin
g
whil
e
on unb
o
rn branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul
T
a
n
am
-
3
: support 3way merge on unborn br
a
nch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul T
a
n
am --skip: r
e
vert changes introduced
b
y failed 3
w
ay
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pull:
use
g
it-rev-parse
-
-parseopt for 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
Pau
l
Tan
t55
2
0
:
c
heck re
f
log
a
c
tion in fas
t
-f
o
r
w
ar
d
merge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5521:
test
-
-dr
y
-run d
o
es not mak
e
any chan
g
es
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l Tan
t552
0
: t
e
st --rebas
e
f
a
ilure
on
u
n
b
or
n
branch
w
ith
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t
5520:
t
est --rebas
e
wi
t
h
multiple branches
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul
T
a
n
t5520: test work tree fas
t
-forward
when fetch u
p
dates
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
P
aul Tan
t5520: test for fai
l
u
re if in
d
e
x
has unresolved
entrie
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul
T
an
pull: parse
p
u
ll
.
ff
as a bool or st
r
ing
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul
Tan
pull: ma
k
e
p
ull
.
f
f=true
override
m
e
rge
.
ff
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul T
a
n
pull: hand
l
e -
-
log=<
n
>
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
P
a
u
l
Tan
t5520:
te
s
t
no mer
g
e c
a
ndidates cases
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
t
5
520
:
prevent fie
l
d splitting
in content
c
omparisons
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-14
Paul
Tan
pull: remove --tags error in no merge candidates c
a
se
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul
T
an
path
.
c: remove home_config_paths()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
git-config: r
e
p
l
ace us
e
of
h
ome_
c
onfig_paths(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
git-c
o
mmit
:
re
p
lace use
of
h
ome
_
config_p
a
ths
(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
credential-store
.
c:
replace h
o
me_co
n
fig_paths()
wit
h
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Ta
n
d
ir
.
c
:
replac
e
home_co
n
f
ig_paths() with xdg_c
o
n
fig_home()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
P
aul Tan
a
t
tr
.
c: repl
a
c
e
h
ome_
c
o
n
fig_paths() with
x
dg_config_home(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
path
.
c
:
implement
x
dg_c
o
nf
i
g_home
(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-31
Paul Tan
en
t
er_repo(): fix docs t
o
ma
t
ch co
d
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Paul Ta
n
t0302: test creden
t
i
a
l
-
s
t
ore
s
u
pport
f
or
X
DG_CONFIG_H
O
ME
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Paul
T
an
git-c
r
ed
e
ntial-store: support XDG_CONFIG_HOME
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Paul
Tan
git-c
r
edential-store: support multiple c
r
e
d
e
n
tia
l
files
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree