repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jh/trace2'
2019-05-13
Denton Liu
difftoo
l
: fallback
on
merge
.
guitool
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-05-13
Dento
n
Liu
difft
o
ol: make --gui, -
-
too
l
and --extcm
d
mutuall
y
.
.
.
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-05-13
D
ento
n
L
iu
m
e
r
getool: f
a
llback to t
o
ol when guitool
u
n
ava
i
labl
e
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-05-13
Denton Liu
merg
e
t
o
ol--lib: create
g
u
i
_mo
d
e fu
n
ction
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-05-13
De
n
ton Liu
mer
g
eto
o
l: use get_merge_tool fu
n
cti
o
n
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-05-09
De
n
t
o
n Liu
tag: fix typo in nest
e
d tagging hint
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-05-07
D
en
t
o
n Liu
r
e
visions
.
txt: mention <
r
ev>~
form
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-05-07
Dento
n
Liu
revisions
.
txt: mark op
t
ion
a
l
r
ev argum
e
nts with [
]
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-05-07
Denton Liu
r
e
v
isions
.
t
x
t: ch
a
nge "rev" to "<rev>"
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-05-07
Denton Li
u
br
a
nch
:
mak
e
create_branch accept
a
merge base rev
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-05-07
Denton Liu
t2018: cleanup in current test
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-05-05
D
e
nton
L
iu
*
.
[ch
]
:
manually align param
e
ter lis
t
s
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-05-05
Den
t
o
n
Liu
*
.
[
c
h]:
r
emo
v
e ex
t
ern from
fu
n
c
t
io
n
decl
a
rations using
sed
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-05-05
Den
t
on Liu
*
.
[
c
h]:
remo
v
e
ex
t
ern from funct
i
on dec
l
a
ration
s
us
i
ng
.
.
.
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-04-25
D
e
n
t
on
Liu
t76
1
0: add mergetool
--g
u
i tests
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-04-25
Denton Liu
t7610:
u
ns
u
ppress output
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-04-19
Denton Li
u
cherry-pick/revert:
add sciss
o
rs line on
merge
c
o
n
flict
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-04-18
Denton
Liu
merge: add s
c
is
s
ors l
i
ne on mer
g
e co
n
fli
c
t
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-04-18
Denton
L
iu
merge: cleanup mes
s
age
s
li
k
e commit
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-04-18
De
n
ton Liu
par
s
e-options
.
h
: extract common
--cle
a
nup option
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-04-18
Denton
Liu
co
m
mit: extract clea
n
up_m
o
de function
s
to sequencer
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-04-18
D
e
nton
Liu
t750
2
:
clea
n
up style
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-04-18
Den
t
on Liu
t7
6
04: clea
n
up s
t
y
l
e
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-04-18
Denton
Liu
t3507: clean up
s
tyle
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-04-18
Denton Li
u
t7600:
c
l
e
a
n
up sty
l
e
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-04-12
Denton Liu
tag: advise
on ne
s
ted ta
g
s
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-04-10
Denton Liu
submodule: teach set-branch subcomman
d
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-04-05
Denton Liu
tag: fix
formatting
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-04-04
Denton Liu
cocci: FLEX_
A
LLOC_MEM to FLE
X
_A
L
LOC_STR
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-04-04
Denton Liu
m
idx
.
c: conver
t
FLEX_ALLO
C
_MEM to FLEX_ALLOC_STR
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-03-12
Denton L
i
u
c
ontrib/subtr
e
e:
e
nsure o
n
l
y one rev is provided
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-03-08
Denton
L
i
u
docs: move core
.
excludesF
i
le from git-add t
o
gitignore
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-03-08
D
e
nton Liu
gi
t
-
clean
.
txt:
c
l
ari
f
y
i
gn
o
re pa
t
tern files
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-03-05
Denton Li
u
git-re
s
et
.
txt: cla
r
ify
d
ocumen
t
ation
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-02-15
Denton Liu
su
b
module:
d
oc
u
ment de
f
ault behavior
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-02-08
D
e
nto
n
Liu
submod
u
le--
h
elper: tea
c
h config subcommand
--unset
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-02-07
Denton Liu
git-sub
m
odule
.
t
x
t: "--br
a
nch <branch>" o
p
tion de
f
aults
.
.
.
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2019-02-06
Denton Liu
c
ompletion
:
comple
t
e git submodule abso
r
bg
i
tdirs
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2018-10-25
Denton Liu
doc: document diff/merge
.
g
u
i
tool conf
i
g keys
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2018-10-25
Den
t
on Li
u
com
p
le
t
ion: support
`
gi
t
m
ergetool --
[
n
o
-
]
g
ui`
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2018-10-25
D
enton Liu
mergetool: a
c
c
ept -g/--[
n
o
-
]gui
as arguments
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
D
enton Liu
Document the --no-gui
o
ption
i
n difftool
Signed-off-by:
Denton Liu
<liu.denton@gmail.com>
commit
|
commitdiff
|
tree