repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'sg/commit-cleanup-scissors' into next
2015-06-08
Paul Tan
a
m --abort: keep unrelate
d
commi
t
s on unborn branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am --
a
bort: sup
p
ort aborting to unborn branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am
--abort: revert cha
n
ges intro
d
uced by faile
d
3wa
y
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am
--skip: s
u
pport ski
p
p
ing while on
un
b
or
n
branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Pau
l
Ta
n
am -3: suppo
r
t 3w
a
y merge o
n
unborn branch
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am --skip:
r
e
v
e
rt changes introduce
d
b
y
failed 3way
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pu
l
l: use g
i
t-rev
-
parse -
-
parseopt for option parsi
n
g
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul
T
an
pu
l
l: han
d
le
g
it-fetc
h
's opt
i
ons as we
l
l
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t
5520:
c
h
eck
reflog ac
t
ion
in
f
ast-f
o
rward merge
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l
Tan
t
5
521:
t
est --dry-r
u
n does
n
ot make
any chang
e
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Pau
l
Tan
t55
2
0: test --
r
ebase failu
r
e on
u
nbo
r
n
b
ra
n
ch with
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Pau
l
Tan
t
5
520
:
test --rebase with multiple branches
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5
5
20: test work tree fast-f
o
rward when fetch updates
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520:
t
e
st for fa
i
l
u
re if index ha
s
u
n
resolved
e
ntries
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull:
p
a
rse
p
ull
.
f
f
a
s
a bool or s
t
ring
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull: make pull
.
ff=true ove
r
ride me
r
ge
.
ff
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Ta
n
pull:
handle -
-
log=
<
n>
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Pa
u
l Tan
t5
5
20: test no merge c
a
n
di
d
ates case
s
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
t5520: prevent
f
ield
s
plitting
in con
t
ent compar
i
sons
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-14
Paul Tan
p
u
l
l
: remove --t
a
gs error in n
o
merge
candidates
case
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Pa
u
l Tan
path
.
c: r
e
move home_
c
on
f
ig_paths()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
g
i
t
-confi
g
:
r
e
p
lac
e
us
e
of home_config
_
paths(
)
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
git-commit: rep
l
ace us
e
of home_config_p
a
ths()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Pau
l
Tan
credent
i
a
l-store
.
c: replac
e
home_con
f
ig_paths
(
) with
.
.
.
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
P
a
ul Ta
n
d
ir
.
c:
repl
a
ce ho
m
e
_
con
f
ig
_
paths() with
x
d
g_con
f
ig_hom
e
()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
P
aul
Tan
a
t
tr
.
c
:
rep
l
ace home_conf
i
g_paths()
w
ith xdg_conf
i
g
_
home()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
path
.
c:
implement
x
dg_config_
h
om
e
()
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-31
Pa
u
l Tan
enter_repo(): fix docs t
o
match co
d
e
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Paul Tan
t0302: test c
r
edential-
s
tore su
p
port
f
or XDG_CONFIG_
H
OME
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Paul Tan
git-credential-
s
tore: support XDG
_
CO
N
F
I
G
_
HOME
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree
2015-03-24
Paul Tan
git-credential-store: sup
p
o
r
t
multipl
e
credenti
a
l files
Signed-off-by:
Paul Tan
<pyokagan@gmail.com>
commit
|
commitdiff
|
tree