repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
log,diff-tree: add --combined-all-paths option
2019-02-08
E
l
i
j
ah Ne
w
r
en
log,diff-tree: ad
d
--combin
e
d-all-paths option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
E
lijah Newren
git-show
-
r
e
f
.
txt: fix order of flags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
Elijah
N
ew
r
e
n
git-
r
e
b
ase
.
txt: upda
t
e note
about directory rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
N
ewren
f
ast-export: ad
d
a --sh
o
w-original-ids opti
o
n
to show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
lijah Newr
e
n
fast-
i
m
p
ort: remo
v
e unma
i
ntained duplicate
documentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elij
a
h Newren
f
ast
-
export: add --refe
r
ence-excluded-pa
r
ents option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
lijah Newre
n
fa
s
t-
e
xport:
e
nsur
e
we expo
r
t r
e
queste
d
refs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elij
a
h Ne
w
ren
fast-ex
p
ort: when
usi
n
g
p
aths
,
av
o
id
c
or
r
u
pt stream
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-exp
o
rt
:
move co
m
mit
rewriting log
i
c in
t
o a funct
i
on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elija
h
Newre
n
f
a
s
t-export: avoid dying when fi
l
t
e
r
i
n
g by paths and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
El
i
jah Newre
n
fast-export: use v
a
lue from correc
t
e
num
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah Newren
git
-
fast
-
export
.
txt
:
clarif
y
misl
e
ading docum
e
ntation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
git-fast-import
.
t
x
t
:
fix d
o
c
u
m
e
ntation fo
r
--qui
e
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
N
ew
r
en
fast-export: conve
r
t sha1 to oid
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah
N
e
w
ren
t
6036,
t6043: increase
c
ode covera
g
e for file c
o
lli
s
ion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
jah Newren
mer
g
e
-
recursive:
i
mprove ren
a
me
/
rename
(
1to2)/add
[
/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah
N
ewren
merge-recursive:
u
s
e
han
d
le_file_co
l
lision for ad
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newr
e
n
merge
-
r
ecursive: im
p
rove handling for rename/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merge-recursive: fi
x
rename/
a
dd conflic
t
ha
n
dling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
jah
N
ewren
merge-recursive
:
new fu
n
ction fo
r
better collid
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
l
i
jah Newren
m
e
r
ge-recursive:
increase marker length with depth
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah
N
ewren
t603
6
, t6042: testca
s
es for ren
a
me c
o
l
l
i
s
i
on of alread
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elija
h
N
e
wr
e
n
t6042: add test
s
for c
o
nsistency in f
i
le collision
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-22
Elijah Newren
fs
c
k: mo
v
e
f
sck_head_link() to get_
d
efault_heads
(
)
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah Newren
merge
-
recurs
i
ve: avoi
d
showing
c
o
n
flicts wit
h
merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah Newren
merge
-
recursive: impro
v
e auto
-
me
r
ging messages wit
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-27
Elijah Newren
commit:
f
ix erroneous BUG, 'multiple renames o
n
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
E
lijah Newren
merge-recursive: rena
m
e merge_f
i
le_1() and merge_con
t
ent()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah N
e
wren
merge-recursive: rem
o
v
e
fin
a
l rema
i
ning
c
aller
o
f merge_fil
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah N
e
wr
e
n
me
r
ge-rec
u
rsive: avoid wrapper
function when un
n
ecessar
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah
N
ewren
me
r
ge
-
recurs
i
ve: set
paths cor
r
e
ctly when thre
e
-way
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
Elijah Newren
sequencer: f
i
x --a
l
low-empty-message
behavior, make
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah Newren
u
pdate-ref: a
l
low -
-
no-deref with --std
i
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah
N
e
w
ren
update-ref: fix type of upd
a
te_flags variable to match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
El
i
j
ah Newren
rerere: avoid
buffer
o
verrun
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah Newren
t4200: d
e
m
o
nstrate rerer
e
segfault on speciall
y
crafted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
E
lija
h
N
ewren
Remove supe
r
fluous trailing semicolons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elij
a
h
N
e
w
ren
a
m: avoid d
i
r
ectory
rename det
e
ct
i
on when c
a
lling rec
u
rsive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
l
ijah Newr
e
n
merge-
r
ecu
r
si
v
e
:
add ab
i
lity
to turn
off directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newren
t3401:
a
dd anot
h
er directory rename testcase for
re
b
ase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
El
i
jah Newren
R
e
move
forw
a
r
d declaration of an e
n
um
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
compat/precomp
o
se_
u
t
f8
.
h: u
s
e
more c
o
mmon i
n
clud
e
g
u
ard
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
El
i
jah
N
e
wren
urlmatc
h
.
h: fix include
guard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
El
i
jah Newren
Move definition of enu
m
bra
n
ch_t
r
a
ck from cache
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
alloc: make allo
c
ate_alloc_st
a
te and cl
e
a
r_al
l
oc_state
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
El
i
jah N
e
wren
Add missing incl
u
d
e
s
a
nd forward
declarat
i
ons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
El
i
j
ah New
r
en
git-update-index
.
txt: rewo
r
d possi
b
ly
confusi
n
g
example
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah N
e
wren
t7406: avoid using te
s
t
_must_fail for commands o
t
h
er
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
i
jah Newren
t7406: prefer test_
*
helper f
u
nctions
to test -[feds]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newre
n
t74
0
6: avoid having git com
m
ands up
s
tream of a pipe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
lijah Newren
t7406:
s
i
m
plify
b
y using diff
-
-name-o
n
ly instead of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t
740
6
: fix c
a
l
l tha
t
was failing for
t
he wrong rea
s
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Elijah New
r
en
t
3
03
1
: upd
a
t
e
t
est description
t
o me
n
tion desire
d
b
e
havio
r
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
El
i
jah Newren
r
e
a
d
-
cache:
f
ix directory/file
conflict han
d
ling in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newre
n
t1015: de
m
onstrate directory/file c
o
nflict re
c
o
v
ery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
Elijah Newren
merge
-
recursive: pres
e
rve skip_worktree bit when nec
e
ssary
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah N
e
w
r
e
n
t
7
405:
veri
f
y
'
merge --abort' work
s
afte
r
s
u
b
module
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
li
j
ah N
e
wren
t7
4
05: add a dire
c
t
o
ry/su
b
module conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elija
h
Newren
t
740
5
: add a file
/
submodule conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elij
a
h Newren
merge:
f
i
x misleading
pre-me
r
ge
check documentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newr
e
n
m
e
rge-r
e
cursive: enforce rule
t
hat
index matc
h
es
h
ead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Ne
w
ren
t60
4
4: add more testcases wit
h
staged changes befo
r
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
m
erge-r
e
c
u
rsive: fix assumption that head tree being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah Newren
me
r
ge-recurs
i
v
e: make s
u
r
e
w
hen we
s
ay
w
e abort th
a
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newr
e
n
t6044: add a testcase
f
o
r index m
a
t
ching head, when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t6036: add a
f
ailed conflict detecti
o
n
case: regular
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
El
i
j
ah Ne
w
re
n
t6036: ad
d
lots
of
d
etail for dir
e
ctory/file
c
onflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6042: add testcase
c
ove
r
ing long chains of rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah
N
ewren
t6042: add testcase covering rename/rename(2to1)/del
e
te
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t
604
2
: add te
s
tc
a
se cover
i
ng rename/add/delete
conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah Newren
t6036: add a
failed confl
i
c
t detecti
o
n cas
e
with conflicting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
Newren
t6
0
36: add
a
failed c
o
nflict detection
case
w
ith submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
li
j
ah Ne
w
ren
t6036: add a fai
l
ed
con
f
li
c
t detection case with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah Newren
t6036: a
d
d a fa
i
led
c
onflict detect
i
on case with symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah Newren
t6036:
a
d
d
a failed conflic
t
detection case with s
y
mlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
j
a
h Newren
t6044: ver
i
fy th
a
t merge
s
expected to abort actually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah New
r
en
index
_
has
_
changes(): avoi
d
assuming o
p
e
rating on the_index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
read-cac
h
e
.
c: move index_has_changes() from me
r
g
e
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elij
a
h Ne
w
ren
t5407
:
f
ix te
s
t
to
cover inten
d
ed arguments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah N
e
wren
apply: fix
grammar
e
rror in co
m
ment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newr
e
n
g
it-rebase-
-
me
r
ge: modernize
"git-$cmd" to "git $cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah
Newren
Fix us
e
of strat
e
gy opti
o
ns wi
t
h inte
r
active rebases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
t34
1
8: add test
c
ase showing pro
b
lems with rebase
-
i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ijah Newren
git-rebase: make
-
-a
l
low-em
p
ty-
m
essage the default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
El
i
jah N
e
w
ren
t
3401: add directory rename testc
a
se
s
for
r
e
b
ase
a
nd
a
m
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
Newren
git-
r
ebase
.
txt: document behavioral differences
be
t
ween
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newr
e
n
directo
r
y-rena
m
e-dete
c
tion
.
txt: technical docs on abil
i
ties
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ijah Ne
w
r
e
n
git-rebase
.
txt: address
conf
u
s
i
on between
--no-ff vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
git-rebase: error o
u
t
when incompatible
o
ptio
n
s
p
a
ssed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah New
r
en
t342
2
: new
t
estcases for
c
hec
k
ing when incompatible
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Newren
git-rebase
.
sh: updat
e
help messages a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elij
a
h Newren
git-rebase
.
txt: document
inco
m
patib
l
e op
t
ions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Elijah Newren
Rel
N
otes 2
.
18: clarify where directory rename det
e
ction
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newre
n
me
r
ge-recursive: add poi
n
te
r
about unduly c
o
m
p
l
ex
looki
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah
Ne
w
ren
merge-recurs
i
ve: renam
e
c
o
nflict_rename_*() f
a
m
ily
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
i
j
a
h
N
e
wren
me
r
ge-recursi
v
e
: clarify the
rename_dir/
R
EN
A
ME_DIR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
El
i
jah Newren
merge-recursive
:
align labels with
thei
r
respecti
v
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
ijah Newre
n
m
e
rge-re
c
ursiv
e
: f
i
x nu
m
e
r
ous ar
g
ument ali
g
nment iss
u
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Eli
j
ah New
r
en
m
erg
e
-recursive
:
fi
x
miscellaneous grammar error in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elij
a
h Newren
RelNo
t
es: remove d
u
plicate release note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next