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
merge: remove drop_save() in favor of remove_merge_branch_state()
2019-02-14
Elija
h
Newr
e
n
git-rebase
.
txt:
update to ref
l
ect mer
g
e now implemented
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
E
l
ijah Newren
git-show-
r
ef
.
txt
:
fi
x
orde
r
of
f
l
ags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
E
lijah Newren
rebas
e
: impleme
n
t --
m
erge via the interactive machinery
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elija
h
Newren
rebas
e
: define
l
i
n
e
arization order
i
ng and enforce it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
l
ijah Newren
git-legac
y
-rebase: s
i
mplify
u
n
necess
a
ry tripl
y
-nested if
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
git-reb
a
s
e
,
se
q
uencer: extend --qui
e
t option
f
or t
h
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
am, rebase--merge: do
not ov
e
rlook --skip'ed com
m
its
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
t54
0
7:
a
d
d
a test demons
t
rating how intera
c
t
i
v
e
h
a
ndles
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
l
i
jah Ne
w
ren
rebase
:
fix incompatibl
e
opt
i
ons e
r
ro
r
mess
a
ge
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newr
e
n
rebase: make
b
uiltin an
d
l
egacy s
c
ript er
r
or me
s
s
a
ges
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
Elijah N
e
wren
git-
r
eb
a
se
.
tx
t
: update note about directory rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fa
s
t
-
export
:
add a -
-
show-original-
i
ds o
p
t
i
on
to
sh
o
w
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah
New
r
en
f
ast-import
:
remove unmaintained duplicate documentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ijah
N
e
w
r
e
n
fast-export: add --
r
eference-excluded-p
a
ren
t
s
opti
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
lijah
N
e
w
r
e
n
fast-export:
ensure
w
e
export r
e
q
ueste
d
refs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah Newren
fas
t
-ex
p
ort:
when using paths, avoid c
o
rrupt strea
m
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
lijah Newren
fas
t
-exp
o
r
t
: m
o
ve commit rewritin
g
l
o
gic into a function
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
El
i
jah Newren
f
ast-ex
p
o
r
t: avoid dying wh
e
n fi
l
tering by paths a
n
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elij
a
h Newren
fast-export: use
va
l
ue from
correc
t
enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah
N
ew
r
en
git-fast-export
.
txt: clarify
m
i
s
l
eading
doc
u
mentat
i
on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
lijah Newren
git-fast-import
.
txt: fi
x
doc
u
mentation for --qui
e
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elij
a
h Newre
n
fast-export:
c
onvert sha1
t
o
oid
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
t6036,
t6043: i
n
cr
e
ase code coverage
f
o
r
f
i
l
e collisi
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah
Ne
w
re
n
m
erge-r
e
cursive: i
m
pr
o
ve
rename/r
e
n
am
e
(1to2)/add[/
a
dd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
m
erge
-
recursive: use
h
andle_file_co
l
l
i
sion for a
d
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
lij
a
h
Newren
me
r
ge-recursive: improve handling for r
e
nam
e
/r
e
name
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
lij
a
h Newren
merge-recursive: fix r
e
name/add conflict
handl
i
ng
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah N
e
w
r
en
merg
e
-
recu
r
s
ive: n
e
w
f
unction for better collidi
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
l
i
jah Newren
merge-recursive: inc
r
ease marker leng
t
h wit
h
d
e
p
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
jah Newr
e
n
t6036,
t
60
4
2
: testcases for rename collision of already
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
t6042: add tests for consistency in file collisio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-22
Elijah
N
ewren
fsck: move f
s
c
k
_head_lin
k
() to
ge
t
_default_heads()
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah Newren
merge-recursive: avoid showing conflic
t
s with merg
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah Newren
m
e
rge-recursive: im
p
rove auto-m
e
rging messages with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-27
El
i
jah Newren
commit: fi
x
erroneous BUG, 'multiple
r
enames on the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah
Newren
merge-recurs
i
ve: rename mer
g
e_f
i
le_1() and merge_
c
ontent()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Ne
w
ren
merge
-
recursi
v
e:
re
m
ove fin
a
l remain
i
ng caller of merge_file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
me
r
ge-rec
u
rsive:
a
void wrapper
f
unc
t
io
n
wh
e
n un
n
ecessa
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah
Newren
merge-recursive: set paths correc
t
l
y
when three-wa
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
El
i
jah Newren
sequencer: fix --
a
llow-empty-m
e
ssage behavior, make
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah Newren
update-ref: a
l
low -
-
no-der
e
f
with
-
-
s
t
din
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elija
h
New
r
e
n
update-ref: fi
x
t
ype
o
f update_flags variable to match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah Newren
r
erere: avo
i
d bu
f
fer overrun
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elija
h
Ne
w
ren
t42
0
0: demons
t
ra
t
e
rerer
e
segfault o
n
specially craf
t
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
Elij
a
h N
e
w
r
en
Remove
superfluous trailing s
e
micolons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
l
ijah Newren
am: avoid director
y
ren
a
me detection
w
hen calling recu
r
sive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newr
e
n
merge-re
c
ur
s
ive: add ability to turn off
direc
t
ory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
li
j
ah
N
ewren
t340
1
: a
d
d another directory
r
ename t
e
stca
s
e fo
r
rebase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah
Newr
e
n
Remove forw
a
rd de
c
larati
o
n o
f
an en
u
m
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
compat/
p
recompose_utf8
.
h: us
e
mor
e
common include guard
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
El
i
jah Newren
u
rlm
a
t
ch
.
h:
f
ix i
n
cl
u
de
gu
a
rd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
Move definition of enum
b
r
anc
h
_tr
a
ck from
c
a
c
he
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah New
r
e
n
alloc
:
make allocate_alloc_state a
n
d
clea
r
_all
o
c_state
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
Add mi
s
sing
i
n
cludes and
f
o
rwar
d
de
c
larations
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
i
jah Newren
g
it-upd
a
te-index
.
txt:
r
eword possibly
c
o
n
fusing
e
xample
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Eli
j
a
h N
e
wr
e
n
t7406: avoid using test_must_fa
i
l
for commands other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7
4
06:
p
refer test
_
* helper fu
n
c
t
i
o
ns
to test -[feds
]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Eli
j
ah Newren
t7
4
06: avoid
hav
i
n
g
git
c
ommand
s
u
p
stream of a pipe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newre
n
t7406: simp
l
ify by u
s
ing diff --name
-
only instead
o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah New
r
en
t7406: fix c
a
ll t
h
at w
a
s
failing for th
e
wrong r
e
ason
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
E
l
i
jah N
e
wr
e
n
t3031: upd
a
t
e
test description to me
n
tio
n
desired behavior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elija
h
Newr
e
n
read-cache: fix directory/file
c
o
nflict
h
andling in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah
Newren
t1
0
15: d
e
mo
n
s
tr
a
te direct
o
ry/fi
l
e conflic
t
rec
o
ver
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
Elijah
Newren
merg
e
-recurs
i
ve: preser
v
e
s
kip_worktre
e
bit when
necessary
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah N
e
wren
t7405: verify
'merge
-
-
a
bor
t
' works after sub
m
odule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elija
h
Ne
w
ren
t7405: add a directory/submodule conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t
7
4
05: add a file
/
s
ub
m
odule c
o
nflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah
Newren
merge: fix misleading pre-merge
c
h
eck docu
m
e
n
tation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah New
r
en
merge-recursive: en
f
o
rce rul
e
that ind
e
x match
e
s
head
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t6044: add
m
ore testcases with sta
g
ed chang
e
s b
e
fore
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
jah Newren
merge-r
e
cu
r
sive: fix assu
m
ption th
a
t h
e
ad
tree being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge-recursive: make sure when we s
a
y we abort th
a
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
N
ewren
t6
0
4
4: add a testcase fo
r
index
m
a
tching he
a
d, when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah Newre
n
t6036
:
add a
f
ailed co
n
f
l
ict detection ca
s
e: regula
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elijah Newren
t6036: a
d
d lots of de
t
ai
l
fo
r
directory/file conflict
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
ewren
t6042: add
te
s
tcase covering long chains of ren
a
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
Newr
e
n
t
6042
:
add testcase covering rename/rename(2to1)/delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
Newren
t604
2
: add te
s
tc
a
se covering
r
ename/add/de
l
e
te conflic
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah Newren
t6036: a
d
d a failed c
o
nflict detection case with conflicting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah New
r
en
t
6
0
3
6: add
a
failed conflict
d
e
tection case with s
u
bmo
d
ule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
a
h Newren
t
6036:
add
a failed conflict detec
t
ion case with
s
ubmodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elija
h
Newren
t6036: add a
failed conflict detection case with s
y
mlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
Newren
t60
3
6: add a fai
l
ed conflict d
e
te
c
tion
case with symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h Newren
t6044: v
e
rify that merges expected to abort act
u
all
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
in
d
ex
_
has_
c
hanges(): avoid as
s
uming operating on the_
i
ndex
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
re
a
d-cache
.
c: m
o
ve in
d
ex_h
a
s_c
h
anges
(
)
from merge
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elija
h
Newren
t54
0
7: fix tes
t
t
o cov
e
r intende
d
arguments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
El
i
jah Newren
a
pply: fix grammar error in comm
e
nt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah N
e
wre
n
git-rebase--
m
erge: moder
n
ize "
g
it-$cmd" to "git $cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah New
r
en
F
i
x
us
e
of strategy options wit
h
in
t
eractive rebases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
N
ewren
t3418: add testcase
show
i
ng problems with
rebase -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
g
i
t-rebase: make --allow-e
m
pty-message t
h
e default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elija
h
New
r
e
n
t
3401: add directory rename testcases for rebas
e
a
nd am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
gi
t
-
r
ebase
.
txt: document behavi
o
ral differences bet
w
een
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
i
j
ah Newren
direc
t
ory-
r
ename-
d
etecti
o
n
.
txt: tec
h
nical docs on abilities
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
N
ewren
git-reb
a
se
.
txt: a
d
dress confu
s
ion b
e
tween --no
-
ff vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah Newren
git-rebase: e
r
r
o
r out whe
n
incompatible options pass
e
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lijah N
e
wren
t
3
4
22: new t
e
stcases for c
h
ecking when incompatible
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Newre
n
git-rebas
e
.
s
h
:
upda
t
e he
l
p
messages a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah N
e
wren
git-rebase
.
txt: do
c
ume
n
t incompati
b
le
o
ptions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next