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
repack: refactor finding pack prefix
2023-09-06
Sergey Organov
doc/
d
iff-options: f
i
x link to
g
ener
a
tin
g
patch section
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2022-09-16
Sergey O
r
ganov
dif
f
-merges: c
l
a
rify
l
og
.
d
i
ffMer
g
es
d
ocume
n
tatio
n
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2022-09-16
Sergey
Organ
o
v
diff-merges:
c
leanup se
t
_diff
_
me
r
ges()
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2022-09-16
Ser
g
ey Organov
d
i
f
f
-mer
g
es: cleanup func_b
y
_
o
pt()
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-10-28
Sergey
Organov
s
t
ash: get rid of unused argu
m
e
nt in stash_stage
d
()
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-10-18
S
e
rgey Organov
stash: implem
e
nt '--staged
'
option for 'push
'
an
d
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-09-07
Ser
g
e
y
Orga
n
ov
diff-index: restore -c/--c
c
options
handling
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Sergey Orga
n
o
v
di
f
f-
m
erges: let "-m" im
p
ly
"
-
p
"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Se
r
g
ey Or
g
anov
diff
-
m
erges: rename "comb
i
n
e
d_
i
m
ply_patch
"
to "merge
s
_i
m
pl
y
_
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Se
r
gey Organ
o
v
stash list: st
o
p passing "
-
m
" to
"
git log"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
S
erg
e
y
Organov
git-
s
vn: stop passi
n
g
"
-
m"
to "
g
i
t
rev-list"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Se
r
gey Orga
n
ov
diff-me
r
ges
:
mo
v
e specifi
c
di
f
f-index "-m" h
a
nd
l
ing
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Sergey Organov
t401
3
: test "git
d
if
f
-
i
nd
e
x
-m"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Serge
y
Organov
t
4
013:
t
e
s
t "git diff-tree -
m
"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Se
r
g
e
y Organ
o
v
t4013: test
"
git
l
o
g
-m --st
a
t"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Sergey Organov
t40
1
3: tes
t
"g
i
t log -m --r
a
w"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-05-21
Sergey Organov
t4013: test t
h
at "-m" alone h
a
s
n
o effe
c
t i
n
"git log"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-04-17
Ser
g
e
y Organo
v
doc/diff-options: d
o
cument n
e
w
-
-
diff-merges features
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-04-17
S
e
rgey Organov
diff
-
merges: introduce lo
g
.
diffMerges config variable
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-04-17
Sergey Or
g
anov
di
f
f
-
merges: adapt -m to enable default diff format
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-04-17
Sergey Organov
di
f
f
-
merg
e
s
:
ref
a
cto
r
set_diff_merges()
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2021-04-17
S
ergey Organov
diff-merges: introduce
--d
i
ff-merg
e
s=on
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organov
t4013: add tests for --diff-merges=fir
s
t-par
e
nt
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organ
o
v
d
o
c/git-sh
o
w: incl
u
de -
-
diff-merges desc
r
iption
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organov
doc/rev
-
l
i
st-option
s
: document --first-pare
n
t c
h
anges
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Org
a
nov
do
c
/dif
f
-generate-patch: mentio
n
new --dif
f
-merges
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey
Organov
doc/git-log: des
c
ribe new --diff-m
e
rges options
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Serg
e
y Organ
o
v
diff-
m
erges: add '--diff-merg
e
s=1' as
s
y
n
onym
f
o
r
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Serg
e
y O
r
ga
n
ov
d
if
f
-mer
g
es:
ad
d
old mnemonic counterpa
r
ts to --diff
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey
O
rg
a
n
o
v
diff-merges:
l
e
t new o
p
t
i
ons e
n
able
diff without -p
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
ergey
O
rga
n
ov
d
i
ff
-
merge
s
: d
o
not im
p
l
y
-p fo
r
ne
w
op
t
ions
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Se
r
ge
y
Organov
diff-merg
e
s
:
implement new values for --dif
f
-merges
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Ser
g
ey O
r
gano
v
diff-merges:
m
ake -m/-c/--cc ex
p
licitly mut
u
a
l
ly exclusive
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organov
diff
-
merg
e
s
: ref
a
ctor o
p
t
s
e
ttings int
o
separate
fun
c
tions
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Or
g
ano
v
diff
-
m
erges:
get rid of now empt
y
d
iff_m
e
rges_init_revs()
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organov
diff-merge
s
: group dif
f
-me
r
ge fla
g
s
n
e
xt to each other
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey
O
r
g
a
nov
diff
-
merg
e
s:
s
plit 'ignore_merges' field
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Ser
g
ey Organov
di
f
f-merges: fix -m to properly override -
c
/--cc
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Serg
e
y
O
r
ganov
t
4
013
:
add
tes
t
s for -m failing to ov
e
rr
i
de -c/--cc
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Serge
y
Organov
t4013:
s
upport
test_expect_failure through ':failure
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Se
r
gey Organov
d
if
f
-merges: revise
revs->diff
flag handling
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organov
diff
-
merg
e
s: handl
e
i
mpl
y
-p on
-
c/--cc l
o
g
ic for
l
og
.
c
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Serge
y
Orga
n
ov
diff-mer
g
es: intr
o
duce revs->first_p
a
rent_merges flag
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
erg
e
y O
r
ganov
diff-mer
g
es: new fun
c
tion di
f
f_m
e
rges_set_d
e
n
se
_
combined_i
f
_
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Serg
e
y Organov
diff-me
r
ges: n
e
w fun
c
tion di
f
f_me
r
ges_supp
r
ess()
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
e
r
g
e
y
O
rganov
di
f
f
-
merges: re-arrange functions
t
o match the order
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Or
g
anov
di
f
f-merg
e
s: rename diff
_
m
e
rges_defau
l
t_
t
o_ena
b
le(
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
e
r
gey Organov
d
i
ff-me
r
ges: move c
h
ecks for first_parent_only o
u
t
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
e
rgey Organov
diff-merges: renam
e
a
l
l
f
u
n
ctions to have common prefix
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Ser
g
ey Organov
revis
i
o
n
: move diff merges functi
o
ns to
i
t
s own diff
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
ergey Organov
revis
i
on: p
r
ovide
i
m
plementation for diff merges tw
e
a
k
s
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organov
revis
i
on:
fact
o
r o
u
t initialization of di
f
f-merge rel
a
ted
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
ergey
O
rgan
o
v
re
v
ision:
f
actor
ou
t
setup of diff-me
r
g
e
r
e
l
a
te
d
s
etti
n
g
s
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
e
r
g
e
y
O
rganov
rev
i
sio
n
: facto
r
out parsing
of diff-merge
r
elated
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-02
Sergey Organov
glossary: improve "branc
h
" definiti
o
n
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-10-31
Serg
e
y Organov
doc/
d
i
f
f-options: fix
out of
p
l
a
c
e
mentio
n
s
of '--patch/-p
'
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-09-29
Ser
g
ey
O
r
ganov
diff: ge
t
rid of redundant
'de
n
se' arg
u
m
en
t
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-09-06
Sergey Organov
log_tree_dif
f
: get
rid of e
x
tra check for NULL
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-09-06
Se
r
gey Organov
log_tree_diff: ge
t
rid of
c
ode duplication for fi
r
s
t_parent_onl
y
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-31
S
e
r
gey 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
Sergey Organov
pretty-options
.
txt: fix --no-abbrev-commit desc
r
iption
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-11
Sergey
O
rganov
t/t4013: a
d
d tes
t
for
--diff-mer
g
es=off
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-11
Sergey
O
rgano
v
doc/git-log: describe --di
f
f-merg
e
s=off
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-11
S
e
rgey Organov
r
e
vision:
chang
e
"--
d
iff-m
e
rge
s
" option to require
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-05
Se
r
gey Organo
v
revision:
f
ix die() me
s
sag
e
for "--unp
a
cked=
"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
Sergey
O
rganov
t350
6
: va
l
idate '-m 1 -ff'
is
n
o
w
a
cce
p
ted for non
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
Se
r
gey Organo
v
t
3
502: vali
d
ate '-m
1
'
a
rgu
m
ent is now
accep
t
ed for
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2018-12-26
Sergey
O
rganov
cherry-pick
:
d
o
not error on non-merge
c
o
mmits when
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2018-12-26
Serg
e
y
Organov
t3510: stop using '-m 1'
to force failu
r
e mid-se
q
uenc
e
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2018-04-17
Sergey Organov
g
lossa
r
y: substitute "ancestor" f
o
r "direct
ancestor
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2014-09-29
Sergey Organov
Documenta
t
ion/git-reba
s
e
.
t
x
t: document when
-
-fork
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
S
ergey Organo
v
Documentation/
g
it
-
rebase
.
txt:
<ups
t
ream> must be given
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2014-08-12
Sergey Org
a
n
o
v
D
o
c
umentation/gi
t
-
r
ebase
.
txt:
-
f forces a rebase that
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree