repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
sideband: don't lose clear-to-eol at packet boundary
2021-05-21
S
e
rgey Organov
diff-merges
:
le
t
"-m" imply "
-
p
"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
S
ergey Organo
v
diff-merges:
r
ename "co
m
bined_
i
mp
l
y
_
patch"
t
o
"merges_imply_
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Sergey Organo
v
stash list: sto
p
p
a
ssing "-m" t
o
"git log"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Ser
g
ey Organov
g
it-svn: stop
p
a
s
sing "-m" to "git
r
e
v-list"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Sergey
O
rgan
o
v
diff-merges: move specific diff-ind
e
x
"
-m
"
handling
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Sergey Organov
t4013: test "git d
i
f
f
-
i
ndex -m"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Sergey Organov
t401
3
: test "git diff
-
tree -m"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Serg
e
y Or
g
a
n
ov
t
4
0
13
:
te
s
t
"git log -m -
-
stat"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Sergey Organov
t401
3
: test "
g
it log -m --raw"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Sergey Organo
v
t4013: test that "-m" alone
has no effect i
n
"git log"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-04-17
Se
r
gey O
r
ganov
doc/diff-op
t
ions: do
c
ument new --dif
f
-merge
s
features
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-04-17
Ser
g
ey
O
rganov
d
i
ff
-
merges: introd
u
ce log
.
di
f
fMer
g
es config v
a
riable
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-04-17
Sergey Organ
o
v
diff-mer
g
es: adapt
-m to enabl
e
d
efault diff fo
r
m
a
t
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-04-17
Sergey Organo
v
dif
f
-
merges: refactor set_
d
iff_
m
erge
s
()
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-04-17
S
ergey
O
r
ganov
diff-
m
e
r
g
e
s:
introduc
e
--dif
f
-merges=on
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organov
t
4013:
a
dd t
e
s
ts for --di
f
f-merges=first-parent
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organov
doc/git-show:
i
n
clude --
d
iff-merges descripti
o
n
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organ
o
v
doc/rev-list-options: do
c
ument
--fir
s
t-
p
are
n
t chan
g
es
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Serg
e
y
Organov
d
oc/diff-
g
enerate-patch: me
n
t
i
o
n
new --d
i
ff-merges
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Serge
y
Organov
do
c
/git-log: describe new --diff-m
e
rge
s
opt
i
ons
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organov
d
iff-merges: add '--diff-me
r
g
e
s=1
'
as synonym for
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Se
r
gey Organov
diff-
m
erges: add old
mnemonic c
o
unterp
a
rts to --diff
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organov
diff-merge
s
: let new options enable
diff
w
ithout -p
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organo
v
di
f
f
-m
e
rges: do not imply
-p for ne
w
optio
n
s
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
e
rgey
Organov
d
i
ff-merges:
implem
e
nt new va
l
ues for --di
f
f-merge
s
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Se
r
gey
O
rgano
v
diff-merges:
m
ake -
m
/-c/--cc
e
xplici
t
ly mutual
l
y exc
l
u
s
ive
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Orga
n
ov
d
iff-merges: re
f
actor opt
s
e
t
t
i
ngs i
n
to separate functions
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organov
d
iff-merges:
g
et
r
id o
f
no
w
empty diff_merges_init_
r
evs()
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Se
r
gey Org
a
n
ov
di
f
f-merges: grou
p
diff-merge flags next to each other
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Se
r
gey
Organ
o
v
diff-me
r
ges: s
p
l
i
t
'
ignore_merges'
f
ield
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Org
a
nov
diff-merges: fix -m t
o
p
roperly override -c/--cc
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organ
o
v
t401
3
: add test
s
for -m fai
l
ing to override -c/--cc
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey
Organov
t
4
013
:
s
upport
t
es
t
_expect_failure t
h
rough ':f
a
ilure
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
ergey Organov
diff-merges: r
e
v
i
se revs->diff flag han
d
li
n
g
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
ergey Or
g
a
n
o
v
diff-merges: h
a
ndle imply -p on
-c/--
c
c logic for log
.
c
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Ser
g
ey Organov
diff-merges: intr
o
duce
re
v
s
-
>first_parent_merges flag
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Org
a
nov
diff
-
merges: new function diff_merge
s
_set
_
dense
_
c
o
mbined_if_
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organo
v
diff-me
r
ges: n
e
w
function diff
_
merges_suppress
(
)
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organov
diff-merg
e
s: re-
a
rrange
f
unctio
n
s to ma
t
c
h the order
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Serge
y
Organo
v
dif
f
-merg
e
s: renam
e
dif
f
_merges_default_to_enable(
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
ergey Organov
diff-merges: move chec
k
s
for first_parent_only out
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
e
rgey Organov
diff-merges:
rename all fun
c
t
i
ons to have common prefi
x
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey
Organov
revisio
n
:
move di
f
f
m
e
rges
f
unctions t
o
its own diff
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey
O
rga
n
ov
revision:
p
r
ovide im
p
lem
e
ntation for diff mer
g
e
s t
w
e
a
ks
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Or
g
anov
revision: fact
o
r o
u
t
initializatio
n
of diff-merge relate
d
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Ser
g
e
y
Organo
v
revision: factor
o
ut setup of diff-m
e
rg
e
related s
e
tting
s
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey O
r
ganov
revision
:
factor out p
a
rsing of diff-merge related
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-02
Sergey Organov
g
l
ossary: impro
v
e
"branch" defi
n
i
t
ion
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-10-31
Sergey Organov
do
c
/diff-options: fix out o
f
place
m
e
ntions of '--patch
/
-p'
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-09-29
Sergey Organov
diff: get rid of red
u
ndant
'
d
ense'
a
rgument
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-09-06
S
e
r
g
e
y Organov
log_tree_dif
f
: get rid
o
f extra
che
c
k for
N
ULL
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-09-06
Serg
e
y Organov
log_tree_diff: g
e
t rid of cod
e
duplic
a
tion
fo
r
firs
t
_
p
a
rent_only
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-31
S
ergey
O
rga
n
ov
re
v
ision: add separate field for "-m"
o
f "diff-index -m"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-27
Sergey Organov
pretty
-
options
.
txt:
f
ix -
-
n
o
-
ab
b
rev-commit d
e
scr
i
ption
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-11
Ser
g
ey Organov
t/t4013: add t
e
st for --diff-me
r
ges=off
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-11
Serge
y
O
rg
a
n
ov
d
oc/git-l
o
g
: describe --dif
f
-merge
s
=off
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-11
Se
r
gey Organov
r
ev
i
sion: cha
n
g
e "--d
i
ff-me
r
ges
"
option to require
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-05
Sergey Org
a
nov
revision:
fi
x
die() message for "-
-
u
n
p
acked="
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
Ser
g
ey
O
rganov
t3506:
valid
a
te '-m 1 -ff' is n
o
w accepted
f
or non
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
Sergey
O
rganov
t3502: vali
d
ate
'
-
m 1'
a
rgument is now
a
ccepted for
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2018-12-26
Sergey Organ
o
v
cherry-pick:
d
o not error on n
o
n
-
m
e
r
g
e
com
m
it
s
when
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2018-12-26
Sergey Organov
t3510: stop using '-m
1
'
to
f
orc
e
f
a
i
l
ure mid-sequence
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2018-04-17
Sergey
Organov
g
l
oss
a
ry: substitu
t
e "ancest
o
r
"
for
"di
r
ect ances
t
o
r
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2014-09-29
Sergey
O
rganov
Doc
u
menta
t
ion/git-rebase
.
txt: docume
n
t wh
e
n --
f
ork
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
Sergey Organov
Doc
u
ment
a
tion/git-re
b
ase
.
txt:
<upstream> must be
g
iven
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2014-08-12
S
ergey O
r
ganov
Documentation/g
i
t-rebase
.
t
x
t: -f forces a rebase t
h
at
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree