repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
doc: avoid redundant use of cat
2024-03-03
Ser
g
ey Organov
clean: imp
r
ove -
n
and -f
implementa
t
i
o
n
a
nd docum
e
nt
a
tion
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2023-10-09
Sergey
Organov
com
p
letion: complete '
-
-dd'
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2023-10-09
Se
r
gey Org
a
nov
dif
f
-merges: introduc
e
'
-
-dd' option
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2023-10-09
Serg
e
y
Or
g
a
n
ov
diff-merg
e
s: improve -
-
diff
-
merg
e
s doc
u
ment
a
tion
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2023-09-06
Ser
g
ey O
r
ganov
doc/diff-options: fi
x
link
t
o
gener
a
ting
pa
t
ch section
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2022-09-16
Serg
e
y
O
rganov
diff-merges:
cl
a
r
i
f
y log
.
d
iffMerges doc
u
menta
t
ion
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2022-09-16
Sergey Organov
di
f
f-merges: cleanup set_diff_merges()
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2022-09-16
Sergey Organov
diff-m
e
r
g
es:
cleanup func_by_
o
pt()
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-10-28
Sergey Org
a
no
v
stash:
get rid of unused argument in st
a
s
h_st
a
g
ed()
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-10-18
Sergey Orga
n
o
v
stash
:
implement
'
--stag
e
d' option for 'push' and
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-09-07
Sergey
O
rgan
o
v
diff-index:
resto
r
e
-c/--
c
c options ha
n
dling
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Sergey
O
rganov
diff-merges:
le
t
"-m"
imply "-
p
"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Sergey Org
a
n
o
v
d
i
f
f
-merges: rename "com
b
i
n
ed_i
m
ply_patch
"
to "me
r
g
e
s_imply_
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Ser
g
ey Organov
st
a
s
h list: stop passing "-m" t
o
"git log"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Sergey Organov
git-svn: stop passing "-m
"
to
"
git rev-l
i
s
t
"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Sergey Or
g
anov
diff-m
e
rges: move
specifi
c
diff-index "-m" handling
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Serge
y
Organ
o
v
t4013: test
"git diff-
i
ndex
-
m"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Se
r
gey Organo
v
t4
0
13: test "git diff-tree -m"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Sergey Organ
o
v
t4013: t
e
st
"git log -
m
--sta
t
"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Sergey Organ
o
v
t
4
013: test "git log
-
m
--raw"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
S
e
rgey Organ
o
v
t4013:
t
e
s
t
t
ha
t
"-m"
alon
e
has no
eff
e
c
t
in "git l
o
g"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-04-17
Serg
e
y
Organ
o
v
doc/diff-options: document new --diff-merges fea
t
ures
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-04-17
Serg
e
y
Organov
diff-m
e
rges: i
n
troduce log
.
diffMerges con
f
ig vari
a
ble
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-04-17
Sergey Org
a
nov
diff-me
r
ges:
adapt -m to enab
l
e default diff format
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-04-17
Sergey Organov
diff
-
m
e
rges: r
e
factor set_diff_merges()
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-04-17
Sergey Organov
diff-merges
:
i
nt
r
oduce --diff-merges=on
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey O
r
g
ano
v
t4013:
a
dd
tests for --diff-merges=first-p
a
re
n
t
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Or
g
anov
d
oc/
g
it-show: i
n
c
lude
-
-diff-merges
description
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Serg
e
y Organov
doc/
r
e
v-list-options:
document --first-p
a
r
e
n
t changes
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Ser
g
ey
O
rgano
v
doc/diff-ge
n
erate-patch:
m
ention new --diff-mer
g
e
s
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey
Organov
doc
/
g
i
t-log: d
e
scribe
new --
d
if
f
-merges
o
ptions
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Serge
y
Organov
diff-merges:
a
dd '-
-
d
i
f
f-mer
g
es=
1
' as synonym for
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey O
r
gan
o
v
diff-merges:
add old mne
m
onic cou
n
ter
p
arts t
o
--diff
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
erg
e
y Organov
di
f
f-merges:
let
n
e
w options
e
nable
dif
f
without -p
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Serg
e
y Orga
n
ov
diff-merges
:
d
o not im
p
ly
-p for ne
w
options
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Ser
g
ey Organov
d
i
ff-
m
erges
:
i
mplement new value
s
f
or --diff-
m
erges
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
e
rge
y
Or
g
anov
diff-merges: make -m/-c/--cc
explicitly mu
t
ually exclusive
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey O
r
gan
o
v
d
iff-merge
s
: refa
c
tor
o
pt settings i
n
to separate f
u
nctions
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
e
rgey Orga
n
o
v
diff
-
merges:
g
et rid of now
e
mpty d
i
ff_merg
e
s_init_revs()
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
ergey Organov
diff-m
e
rg
e
s:
g
roup
dif
f
-
m
e
rg
e
flags nex
t
to each o
t
her
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
ergey Organov
diff-merge
s
: split 'ignore_merges' fiel
d
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Serge
y
Organov
diff-merges
:
fix -m to properly
o
verride -c/--cc
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
e
r
gey Organov
t4
0
13: add tests
for -m
f
ailing
t
o override -c
/
--cc
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Ser
g
ey Organov
t4013:
s
upport t
e
st_expect_
f
ailure through ':failure
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organ
o
v
diff-
m
erg
e
s: revise
r
ev
s
->diff flag handling
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey
O
rganov
d
iff-merg
e
s: handle imply
-p
on
-
c/--cc logic for log
.
c
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Se
r
ge
y
Organov
diff-merg
e
s
: i
n
tr
o
duce revs->fi
r
st_parent_merg
e
s flag
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organov
d
i
ff-merg
e
s:
n
ew functi
o
n diff_merge
s
_set_dense
_
comb
i
ned_if_
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
e
rgey Organov
dif
f
-merges:
new
function di
f
f_me
r
ges_suppress()
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
e
rgey Organov
d
i
ff-merges: re-arrange functions to match th
e
order
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Se
r
gey Organov
d
i
f
f-merges:
r
en
a
me d
i
ff
_
me
r
ges_
d
efa
u
l
t
_t
o
_enable(
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Ser
g
ey Organov
d
i
f
f
-
merges
:
move c
h
e
cks for first_parent_o
n
ly
o
u
t
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
e
rgey Org
a
n
ov
diff
-
merge
s
: rename
a
ll
f
unctions t
o
have commo
n
prefix
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organov
revision: move diff
merges functions
to its ow
n
diff
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
e
rg
e
y Organov
revis
i
o
n
: provide impl
e
ment
a
t
i
o
n
for diff merges twea
k
s
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey
O
rganov
revision: factor out initializ
a
tion of diff-merg
e
relat
e
d
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
e
rgey Organov
revisio
n
:
factor
o
ut setup of di
f
f-m
e
rge related settings
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Ser
g
ey Organov
revision: factor out parsing of diff-merge
related
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-02
Sergey Organov
gl
o
ssary: improve "bran
c
h" definitio
n
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-10-31
Sergey Org
a
n
o
v
doc/dif
f
-
options: fix out of plac
e
mentions of '
-
-patch/-p'
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-09-29
Serge
y
Org
a
nov
diff
:
get ri
d
o
f
redundant 'dense
'
argument
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-09-06
Sergey
Organov
l
og_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_di
f
f: get rid
o
f
co
d
e duplication f
o
r f
i
rst_parent_only
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-31
Sergey Organov
re
v
ision: add separate field
for "-m" of "dif
f
-
index -m"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-27
Sergey Org
a
n
o
v
prett
y
-
option
s
.
txt: fix --no
-
abbrev-c
o
mmi
t
description
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-11
Se
r
gey Organov
t
/
t40
1
3: add test
f
or --diff-merge
s
=off
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-11
Sergey Organ
o
v
doc/git-log: desc
r
ibe --d
i
ff-merges=off
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-11
Sergey
Organov
re
v
ision:
cha
n
ge "
-
-diff-merge
s
"
optio
n
to require
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-05
S
e
rge
y
Organov
revi
s
ion: fix
d
ie() message
f
o
r
"--unpacked
=
"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
Serge
y
Orga
n
ov
t3506: validat
e
'-m 1
-ff' is
n
ow
a
ccepted for non
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
Serg
e
y Organo
v
t350
2
:
v
a
l
ida
t
e
'-m 1' argument is now accep
t
ed for
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2018-12-26
S
e
rgey Organov
c
h
e
rry-pick:
do not
e
rror on
non-merge commits w
h
e
n
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2018-12-26
Sergey Organo
v
t35
1
0: stop using
'-m
1' to forc
e
failure mid-sequence
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2018-04-17
Sergey Organov
glossary: s
u
bstitu
t
e "ancestor
"
for "direct a
n
c
e
s
t
or
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2014-09-29
Sergey O
r
ganov
Docume
n
tatio
n
/git-rebase
.
txt: document wh
e
n --f
o
r
k
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
Serg
e
y Or
g
anov
Docume
n
tation
/
g
it-
r
ebase
.
txt:
<
upstream>
m
u
st be given
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2014-08-12
S
e
rgey Org
a
nov
Documenta
t
io
n
/g
i
t-
r
eb
a
se
.
txt: -f forces a rebase that
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree