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
diff-merges: fix -m to properly override -c/--cc
2020-12-21
Serg
e
y Organov
d
iff-m
e
rges: f
i
x -m to properl
y
over
r
ide -
c
/--
c
c
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
e
rgey Organ
o
v
t40
1
3: ad
d
test
s
for -m failing to
o
ve
r
r
ide -c/--cc
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey
O
rga
n
ov
t4013: supp
o
rt test_ex
p
e
c
t_fai
l
ure th
r
ou
g
h ':failur
e
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Serg
e
y Orga
n
ov
diff-merges:
r
evise re
v
s->
d
iff fl
a
g handlin
g
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
ergey O
r
gan
o
v
d
iff-merge
s
: ha
n
dle imply -p on -c/--c
c
logic fo
r
l
o
g
.
c
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organov
di
f
f-merges
:
i
n
trod
u
ce revs->first_p
a
rent_merges
f
l
ag
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
e
rgey Organov
diff-merges:
n
ew function diff_merges_set_den
s
e_combined_if_
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey O
r
ganov
diff-merges:
new function diff_merges_su
p
press()
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Se
r
ge
y
Organov
diff-merge
s
:
re-arrange
f
unctions to match the order
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
ergey Orga
n
ov
diff-merges: rename di
f
f_merge
s
_d
e
fault_to_enable(
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Serg
e
y Organov
d
i
ff-merges: move checks for fir
s
t
_
p
ar
e
nt_only out
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Orga
n
ov
diff-merges: rename all fun
c
tion
s
to h
a
v
e c
o
mmon p
r
efix
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
e
rgey Organov
rev
i
s
ion: move diff m
e
rges functions to
its
o
w
n diff
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
S
ergey Organov
re
v
isi
o
n:
p
r
ovide imple
m
ent
a
tion fo
r
diff merges tweaks
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organov
revis
i
on: facto
r
out i
n
itiali
z
ation of dif
f
-merge rela
t
ed
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Org
a
nov
re
v
ision: factor
out
set
u
p
o
f diff-merge related settings
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Sergey Organo
v
revi
s
i
on: factor out parsing o
f
diff-me
r
ge re
l
ated
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-09-29
S
e
rgey Organov
diff: get
ri
d
of r
e
dundant 'dense' ar
g
ument
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-09-06
Sergey Organov
log_tr
e
e_diff: get
r
id
o
f
extra check
for NULL
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-09-06
Sergey Organov
l
o
g
_tree
_
diff
:
get
rid of code
d
upli
c
a
tion for first_
p
arent_onl
y
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-31
S
erg
e
y Or
g
a
nov
revision: a
d
d separate field for "-m"
o
f "diff-index -m"
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-27
Ser
g
ey Organo
v
p
re
t
ty-opt
i
ons
.
txt:
fix --no-abbrev-commit de
s
cription
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-11
S
e
rgey Organov
t/
t
4
013:
a
dd test for --
d
iff
-
merges
=
o
ff
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-11
Serge
y
O
r
ganov
do
c
/git-log: de
s
cribe --di
f
f-mer
g
es=off
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-11
Sergey Organ
o
v
r
evi
s
ion: change "--diff-
m
erges"
opt
i
o
n to require
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2020-08-05
Serg
e
y
O
rganov
r
e
visio
n
: fi
x
die() message for "--unpacke
d
="
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
Sergey Org
a
n
o
v
t3506: validate '-
m
1 -ff'
i
s now a
c
ce
p
ted for
n
on
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
Sergey Org
a
no
v
t3502: validate
'-m 1'
argument is
n
ow accepted
f
o
r
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2018-12-26
Sergey O
r
ganov
c
h
er
r
y-pick:
do not er
r
or
o
n n
o
n
-merge commits when
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2018-12-26
Sergey Orga
n
ov
t
3
510: stop using '-m 1'
t
o
forc
e
failure mid-seque
n
ce
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2018-04-17
S
e
rgey
O
rganov
glo
s
sary: s
u
bstitute "ancestor" for "d
i
rect ancestor
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2014-09-29
Sergey Organo
v
D
ocumentat
i
o
n
/
git
-
r
e
b
ase
.
txt
:
documen
t
w
hen
-
-fork
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
Sergey O
r
ganov
Documentation/git-rebase
.
txt
:
<
u
pstream> must
be given
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree
2014-08-12
Serg
e
y
Organov
Docu
m
entat
i
on/git-rebase
.
txt: -f forces a
r
eba
s
e that
.
.
.
Signed-off-by:
Sergey Organov
<sorganov@gmail.com>
commit
|
commitdiff
|
tree