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
init: make --template path relative to $CWD
2019-02-14
Elij
a
h Ne
w
r
e
n
git-
r
ebase
.
t
x
t
: update to ref
l
e
ct merge no
w
imple
m
ented
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
Elijah Newren
g
i
t-show-ref
.
txt: f
i
x orde
r
of fl
a
g
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
El
i
j
ah Newren
rebas
e
: implement --merge via th
e
interactive
machiner
y
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
rebase: define
l
inearization ordering and
e
n
force i
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elij
a
h Newr
e
n
g
it-legacy-reba
s
e: simp
l
i
fy unnec
e
ssary triply
-
nested if
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
git-r
e
base, sequencer: extend --quie
t
o
p
tion for
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
l
i
ja
h
Newren
am, rebase--m
e
rge
:
do no
t
overlook
-
-skip'ed commits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
lijah Newren
t5
4
07:
add a test dem
o
ns
t
r
a
ting ho
w
interactive handle
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
El
i
ja
h
New
r
en
re
b
as
e
: fix incomp
a
t
i
ble options e
r
ror message
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
El
i
jah N
e
wren
rebase: make builtin and
l
e
g
a
c
y script error me
s
sages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
Elijah
N
e
wren
git-rebase
.
t
x
t:
u
pdate
n
o
te about directory rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-expor
t
: add a --show-
o
r
iginal-ids
o
p
tion to show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-imp
o
rt: remove u
n
ma
i
ntained dupl
i
cate documentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-exp
o
rt:
a
d
d --reference-excluded-pa
r
ents option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fa
s
t-export: ensure we export
r
eq
u
ested
refs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-export: whe
n
us
i
ng p
a
ths, avoid
co
r
rupt stream
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elija
h
N
ewren
f
ast-export:
move comm
i
t rew
r
iting logi
c
into a
f
unction
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-export: avoid d
y
ing when filtering by paths an
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
f
ast-e
x
port
:
use value fro
m
correct enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
gi
t
-fas
t
-exp
o
rt
.
txt: clarify m
i
s
leading d
o
cument
a
tion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
Ne
w
ren
git-fast-import
.
txt: f
i
x documentation fo
r
--quiet
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-expo
r
t:
c
onv
e
r
t
sha1 to oi
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
t6036, t6043
:
inc
r
e
a
se code c
o
v
e
rage
f
or fil
e
c
ollisi
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah
Newre
n
merge-recursi
v
e: im
p
r
o
ve rename/rename(1to2)/add[/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
mer
g
e-re
c
ursive: us
e
handle_fil
e
_collision for add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merge
-
recu
r
s
ive: improve h
a
ndl
i
n
g for re
n
ame/re
n
a
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
l
i
j
ah New
r
en
merge-recursi
v
e: fix rename/add conflict
h
andling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Eli
j
ah Newren
merge-recurs
i
ve:
n
ew function for better
collidin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
l
ijah Newren
merge-recursive:
i
ncrease marker length with de
p
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
t
6
036, t6042: test
c
a
ses
f
or rename collision of already
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
l
i
jah Newren
t6042: add t
e
s
ts f
o
r
c
o
nsistency in file collision
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-22
Elij
a
h Newren
fsck: move f
s
c
k
_head
_
link()
to
g
e
t
_default_heads()
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah Ne
w
ren
merge-recu
r
s
i
ve: avoid show
i
ng conf
l
icts with merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah Newren
mer
g
e-
r
ecursive: improve auto-mergin
g
messag
e
s with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-27
Elijah Newren
commit: fix er
r
oneous BUG, '
m
ultiple ren
a
mes on the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
E
lija
h
N
ewren
merge-recu
r
si
v
e: rename merge_fi
l
e_1() an
d
merge_content()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Eli
j
a
h
Newren
me
r
g
e
-
recursive: remove final remai
n
ing ca
l
ler of merge_file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
El
i
j
a
h Newren
merge-recur
s
ive: avoid wr
a
pp
e
r
function when un
n
ecess
a
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Eli
j
a
h
Newren
merge-recursive: set
p
aths corre
c
t
l
y when three-way
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
Elijah N
e
wren
sequ
e
nc
e
r: fix -
-
all
o
w
-emp
t
y-message behavior, make
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah Newren
update-re
f
:
allow --no-deref with -
-
s
tdi
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
E
l
ijah New
r
en
update-ref:
f
ix
t
ype
o
f upda
t
e_flags
vari
a
ble to
m
a
tch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah Newren
rer
e
r
e:
a
v
oid buffer overrun
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah Newr
e
n
t420
0
: demons
t
rate rerere segfault on
s
p
e
cially
c
rafted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
Elijah
N
ewr
e
n
R
emove superfluous trailing sem
i
colons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
El
i
j
a
h
Newren
am
:
avoid directory rename
detection when
c
a
l
lin
g
recursi
v
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elija
h
Ne
w
ren
merge-recu
r
sive: a
d
d abil
i
ty to turn
off directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newren
t34
0
1: a
d
d another
director
y
r
ename t
e
stca
s
e for
r
ebase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
l
ijah
Newren
Rem
o
ve forward de
c
lara
t
i
on of an
e
nu
m
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
compat
/
precompose_utf8
.
h:
use
m
ore common i
n
cl
u
de
guard
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
lijah
N
ewren
urlmatch
.
h:
f
ix include guard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newre
n
Move
d
efi
n
ition of en
u
m bra
n
c
h
_trac
k
from cache
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newr
e
n
alloc:
make a
l
locate_allo
c
_s
t
ate an
d
c
lear_alloc_
s
tate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
El
i
jah Newren
Add missing i
n
cludes
a
nd forward
declarations
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
El
i
jah
New
r
en
git-update-index
.
txt: reword possibly confusi
n
g example
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: avo
i
d u
s
i
n
g
tes
t
_mus
t
_f
a
il
f
o
r
commands other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
ijah Newr
e
n
t7406
:
prefer test_*
h
elper functions to test
-
[feds]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Eli
j
ah Newren
t7406:
a
void h
a
vi
n
g g
i
t command
s
upstr
e
am
of a pipe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
ijah Ne
w
re
n
t7406
:
simplify by u
s
ing dif
f
-
-
name-o
n
l
y
instead of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
lijah Ne
w
ren
t7406:
fix ca
l
l tha
t
was failing for
the wron
g
reason
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Elijah Newren
t3031: update tes
t
descr
i
p
t
i
on to mention desired behavior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah
N
ewre
n
r
e
ad-cache: fix dire
c
tory/file conflict handling in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
El
i
jah Newren
t
1015: demonstra
t
e directory/fil
e
confli
c
t rec
o
very
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
Elijah New
r
en
merge-re
c
ur
s
ive: pres
e
rve
s
k
ip_worktree bit
w
hen
n
ecess
a
ry
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
ah Newren
t
7
405: ve
r
ify 'merge --abort' works after
s
u
b
modul
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah
N
ewren
t7405:
add a dire
c
tory/submodule confli
c
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah
Newren
t7405:
add a f
i
l
e/su
b
module confl
i
ct
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newre
n
m
erge: fix mi
s
lead
i
ng pre-me
r
g
e
check docum
e
n
t
ation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah N
e
wren
merge-re
c
u
r
s
ive: enforce rule that index m
a
t
c
hes h
e
ad
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t6044: add more te
s
tcas
e
s with st
a
ged c
h
ang
e
s bef
o
r
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge-r
e
cursive: fix assumption that hea
d
t
r
ee being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge-recur
s
i
v
e
:
make su
r
e when we say w
e
ab
o
rt that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t604
4
: add a testc
a
se for index matching head, when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
Newren
t6036: add a fail
e
d conf
l
i
c
t
detecti
o
n
c
ase:
r
e
gular
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elijah Ne
w
ren
t6036: ad
d
lots
of detail for
d
irectory/f
i
le conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h Newre
n
t6042
:
add testc
a
s
e
cove
r
ing long chains of rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
Ne
w
ren
t6042: add te
s
tcase
covering
rename/rename
(
2to
1
)
/delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
Newren
t6042
:
add testcase covering
ren
a
me/add/de
l
ete confl
i
c
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t
6
036: add
a
fa
i
led conflict detection case with conf
l
ic
t
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah New
r
e
n
t6036: add a failed
co
n
flic
t
d
etect
i
o
n case with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newre
n
t
6
036: add
a
failed conflict detection case with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah
Newren
t60
3
6
: add a fail
e
d conflict detection ca
s
e
w
ith symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newr
e
n
t60
3
6: a
d
d a
failed confl
i
ct dete
c
tion
case with symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah Newren
t6044: verify that merges expected to
a
bort ac
t
ually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah Ne
w
r
e
n
i
ndex_
h
as
_
changes()
:
avoid assum
i
ng operating
o
n the_index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ija
h
Newren
read-cache
.
c: move inde
x
_has_chang
e
s() fro
m
merge
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah
Newren
t5407: fix
t
est to
c
over in
t
e
nded arguments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
E
lijah N
e
wren
apply: fix
g
ra
m
mar er
r
or in
com
m
e
n
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elij
a
h New
r
en
git-rebase-
-
mer
g
e: modernize "git-$cmd" to
"
git
$
cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
Fix use of strat
e
gy
o
ptions
w
ith i
n
teracti
v
e
rebases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah Newr
e
n
t3
4
18: add testcase
showi
n
g probl
e
ms w
i
t
h
re
b
ase -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
git-r
e
base:
ma
k
e --al
l
ow
-
empty-mes
s
age the
de
f
a
u
l
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah Newren
t34
0
1
: add
d
ire
c
to
r
y rename testc
a
ses for rebase and am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
git-r
e
base
.
txt
:
document beha
v
ioral dif
f
e
r
ences be
t
ween
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
directory-r
e
name-d
e
tection
.
txt: techn
i
cal
d
ocs on
a
bilities
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ijah
Newren
gi
t
-re
b
a
s
e
.
txt: address con
f
usion b
e
tween --no-f
f
vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
El
i
jah Newren
git-r
e
b
ase: erro
r
out when incom
p
a
tible optio
n
s
pa
s
sed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lij
a
h Newren
t34
2
2: new t
e
st
c
a
se
s
f
o
r ch
e
ck
i
n
g
when
inc
o
mpatible
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah
N
ewren
git-rebase
.
s
h
:
u
pdat
e
help
m
essages
a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
E
l
i
jah
Newren
g
it-re
b
ase
.
txt:
d
ocument incompatible opti
o
ns
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next