repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool: remove an unnecessary call to strbuf_release()
2021-09-07
Sergey Org
a
nov
d
i
ff-index: resto
r
e -c/--cc op
t
ions handling
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Serge
y
Organov
d
iff-merg
e
s
:
l
et "-m" imp
l
y "
-
p"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Sergey Organov
d
i
ff-mer
g
es: renam
e
"combined_imply_patc
h
" to "merges_imply_
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
S
ergey Organ
o
v
stash list: stop passi
n
g
"-
m
"
t
o "git log"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Sergey Organov
g
i
t-svn:
s
top pa
s
sin
g
"-m"
to
"git rev
-
lis
t
"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Sergey Organov
diff-merges:
mov
e
specific diff-i
n
dex "-m" h
a
ndli
n
g
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Serg
e
y
Organov
t4013: test
"
gi
t
d
i
f
f
-
i
ndex -m"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Sergey Organov
t4013: test "git diff-tree -
m
"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Sergey
Organov
t4013: te
s
t "git log
-
m
--stat"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
S
e
rgey O
r
g
an
o
v
t4013: test "git lo
g
-m --raw"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Ser
g
ey Or
g
a
n
ov
t4013: t
e
st that
"
-
m
" alone h
a
s no ef
f
ect in "git
l
o
g"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-04-17
Sergey Org
a
nov
do
c
/
d
iff-opt
i
ons: doc
u
ment new
-
-diff-
m
erges f
e
atures
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-04-17
Sergey Organov
d
i
f
f-merges: intr
o
duce log
.
diffMerges
c
onfig variable
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-04-17
S
ergey Organov
di
f
f-me
r
ges: adapt -m to enable default diff format
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-04-17
Serg
e
y Organov
diff-merges: refactor set_diff_merges()
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-04-17
Sergey Organov
diff-merges: introduce --diff-
m
e
rges=on
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Or
g
anov
t4013
:
add tests for --dif
f
-merges=first-pare
n
t
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey O
r
ganov
doc/git-show: include -
-
diff-merges
description
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Se
r
ge
y
Organov
do
c
/rev-list-o
p
t
ions: docu
m
ent --firs
t
-parent cha
n
g
es
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
e
rgey Or
g
anov
d
o
c
/diff-gene
r
ate
-
pa
t
ch:
me
n
tion n
e
w
--diff-merges
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organov
doc/git-log: describe new --d
i
ff-me
r
ges o
p
t
i
o
ns
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organov
di
f
f-merges
:
add '-
-
diff-merges=1'
a
s syn
o
ny
m
for
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Org
a
nov
d
i
ff-merges: add
o
ld mnemonic
c
o
unterparts
to --diff
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Se
r
gey Organ
o
v
diff-merges
:
l
e
t ne
w
optio
n
s e
n
able dif
f
wit
h
out -p
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey
O
r
ga
n
ov
d
i
ff-mer
g
es:
d
o
not im
p
ly -p for
new options
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Ser
g
ey Organov
d
i
ff-m
e
rges: i
m
plement
n
e
w
v
alues for --diff
-
merges
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Se
r
gey Organov
diff-merg
e
s: make -m
/
-c/--cc explic
i
t
l
y mutua
l
ly
exclusive
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Serge
y
Organov
diff-merges: refa
c
tor opt settings into se
p
arat
e
function
s
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organov
diff
-
merges: g
e
t
r
i
d of n
o
w empty diff_m
e
rges_init_revs()
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Se
r
gey Organov
diff-merge
s
: gr
o
up d
i
ff-merge
fla
g
s next to each
o
t
her
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey O
r
g
an
o
v
diff
-
merges: split 'i
g
n
or
e
_merges' field
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
ergey
O
rganov
diff-me
r
g
es: fix
-
m to prop
e
rly over
r
ide -c/-
-
c
c
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Serg
e
y
O
rganov
t
4013: add tests for -m failing to override -c/-
-
cc
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey
Organ
o
v
t
4013: support test
_
exp
e
c
t
_
f
ailur
e
through ':failure
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
erge
y
Organov
diff-
m
erg
e
s: r
e
vis
e
revs->diff flag handlin
g
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
e
r
g
ey Organov
diff-m
e
rges: handle imply
-
p on -
c
/
-
-c
c
logi
c
f
or log
.
c
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organov
diff-merges: introduce
r
evs->first_
p
ar
e
nt_
m
erges fla
g
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
erge
y
Organov
diff-merges: new
fu
n
ct
i
on diff_
m
erges
_
set_dense_
c
ombined_if_
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
e
rgey Orga
n
o
v
diff
-
merges: new fun
c
t
i
on diff_merges_su
p
press()
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
e
rgey Organov
diff-m
e
rges: re-a
r
range f
u
n
c
tions to
m
a
tch the or
d
er
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Se
r
gey Organo
v
dif
f
-merges: rename dif
f
_merges_default_to_ena
b
le(
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey
Organov
diff-merges: move chec
k
s for first_pa
r
e
n
t_only out
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organov
diff-merges:
r
en
a
me all functi
o
ns
t
o have common prefix
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Serge
y
Organov
r
evision: move diff merges functions to its own diff
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Serge
y
Organov
revi
s
ion: pro
v
i
d
e implementat
i
on for diff merges twea
k
s
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organov
r
evision: factor out in
i
t
i
alizat
i
on of d
i
ff-merge related
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Org
a
no
v
rev
i
si
o
n: fac
t
or out s
e
tup of diff-merge rel
a
ted se
t
tings
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organov
revision: factor out parsing of diff-merge rel
a
ted
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-02
S
ergey
O
rg
a
nov
g
l
os
s
ary
:
improve "branch" defi
n
ition
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-10-31
S
e
rge
y
Organov
doc/diff-options: fix out of place mentions o
f
'-
-
p
a
t
c
h/-p'
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-09-29
Sergey
O
rganov
d
i
ff: get rid of
re
d
u
ndant
'
den
s
e' argu
m
ent
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-09-06
Serge
y
Organov
log_tree_diff: get rid of extra check for NULL
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-09-06
Sergey Organov
log_tree_diff: get rid o
f
code dup
l
i
c
ation for
first_pare
n
t_o
n
ly
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-31
Sergey Organov
revisi
o
n: add
separ
a
te field for "-
m
"
of "diff-index -m"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-27
Ser
g
ey Orga
n
ov
pretty-options
.
t
x
t
:
f
ix --no-abbrev-commit descri
p
tion
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-11
Sergey Organov
t
/
t4013: add test for --diff-merges=off
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-11
Ser
g
ey Organov
doc/gi
t
-
log: des
c
ribe --diff-merges=off
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-11
Se
r
gey Org
a
nov
r
e
v
ision: c
h
ange "--d
i
ff-
m
erges" o
p
tion to require
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-05
S
ergey
Organov
revision: fix die(
)
mess
a
ge for "
-
-unpacked="
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
S
e
rgey Organov
t3506: valida
t
e '-
m
1 -ff'
is now accepted for
n
o
n
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
Se
r
gey Organov
t350
2
: validate
'
-m 1' arg
u
m
e
n
t is now accept
e
d for
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2018-12-26
Sergey O
r
ganov
cherry-p
i
ck: do not er
r
or on non
-
merge commits whe
n
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2018-12-26
Sergey Org
a
nov
t3
5
10:
s
t
o
p using '-m 1
'
to force fai
l
ure mid
-
sequence
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2018-04-17
Sergey Organov
g
lossary: s
u
bstit
u
te "ancestor" f
o
r "direct ancestor
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2014-09-29
Sergey Organov
D
o
cumentat
i
on/git-
r
ebase
.
txt: document when
--fork
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
Sergey Organ
o
v
Documenta
t
i
on/
g
it-rebase
.
txt: <upst
r
eam>
m
ust be given
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2014-08-12
Sergey Organov
Documentation/
g
it-rebase
.
tx
t
: -f forces
a
r
ebase that
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree