repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
fast-import: support 'encoding' commit header
2019-05-14
Elijah Newren
fast-impo
r
t: suppo
r
t
'
enc
o
ding' commit header
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-05-14
Elijah
Newren
t
9350: fix
encoding test to actuall
y
test reencoding
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-01
El
i
jah
N
ewren
fast-import:
f
i
x
e
r
ron
e
ous handl
i
ng of
get-mark with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newre
n
fast
-
import: only
a
llo
w
cat-blob
reque
s
ts where it
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-01
Elijah New
r
en
fast
-
impo
r
t: check most prominent commands fir
s
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-01
E
lijah Newren
git-fast-import
.
txt: fix wordin
g
about where
l
s c
o
mmand
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-01
E
l
ijah Newren
t
9
300: demons
t
r
a
te bug with
get
-
ma
r
k
a
nd empty orphan
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-02-21
Elijah Newren
mer
g
e-
o
p
tions
.
txt: c
o
rrect wording of --no-
c
ommit option
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-02-14
Eli
j
ah Newre
n
git-rebase
.
txt: update to reflect m
e
rge
now implemented
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-02-08
Elij
a
h Newren
l
o
g
,
diff
-
tree: add --combined-all-paths op
t
ion
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-01-10
Elija
h
Newre
n
git-show-ref
.
t
xt:
f
ix
o
rder of fl
a
gs
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-01-07
Elijah Ne
w
ren
reba
s
e: imp
l
e
m
ent --merge via the int
e
ractiv
e
machinery
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
rebase:
de
f
ine
l
inearizatio
n
o
rderin
g
and en
f
orce
i
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
E
lijah
N
ewre
n
git-legacy-rebase: simplify unnecessary tr
i
ply-nested i
f
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
E
l
ijah
N
ewren
gi
t
-rebase, sequencer: exte
n
d --quiet option for
the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
am, r
e
base--m
e
rg
e
:
d
o n
o
t over
l
ook --skip'ed
commits
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
t5407:
a
dd a
t
est demonstrating
h
ow
i
nteractive handles
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
E
l
ijah Newren
rebase: fix incomp
a
tible opt
i
o
ns error message
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
Elija
h
Newren
rebase: make builtin and l
e
gac
y
sc
r
ipt err
o
r mess
a
ges
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-09
El
i
jah Newr
e
n
g
it-rebase
.
txt:
update
n
ote about directory rename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newre
n
f
a
st-export: add a
-
-
show
-
ori
g
inal-i
d
s option to show
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
E
l
i
j
a
h Newren
fast-impo
r
t:
r
e
m
o
ve unmaintain
e
d duplicate docume
n
t
atio
n
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
Elijah New
r
e
n
f
a
st
-
exp
o
rt: add --
r
eference-excluded-pare
n
ts option
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
E
l
i
j
a
h
N
e
wren
fas
t
-e
x
port: e
n
su
r
e we export requested refs
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
a
h Newren
fast-
e
xport: w
h
en usin
g
pa
t
hs,
avoid c
o
r
r
upt stream
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fas
t
-export: move commit re
w
ritin
g
logic into a function
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
Elija
h
Newren
fas
t
-e
x
po
r
t: avoid dying
when filte
r
ing by pa
t
h
s
and
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-export: us
e
valu
e
from correct
e
n
um
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
Elijah N
e
wren
git-fast-export
.
txt: clarify misle
a
ding documentation
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
Ne
w
ren
g
i
t
-
f
a
st-impo
r
t
.
txt:
fix documentation for --quiet
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newr
e
n
fast-export: convert sha1 to o
i
d
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
t6036, t6043: i
n
crease
code coverage for file collision
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-08
E
l
ijah Newren
merge-re
c
ursive: impr
o
ve rename/re
n
a
m
e(1to2)/add[/add
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-08
E
l
ija
h
New
r
en
me
r
g
e
-
r
ecursiv
e
: u
s
e handle_file_collisi
o
n
f
or
add
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-08
E
l
ijah New
r
e
n
merge-rec
u
rsive
:
improve handling for r
e
n
ame/rename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
me
r
g
e-recursive
:
fix
r
ename/ad
d
confli
c
t han
d
ling
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-08
E
l
ijah Newren
merge-recursive: new function for bette
r
colliding
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merge-rec
u
rsive: increase marker length w
i
th de
p
t
h
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-08
E
l
ijah
Newr
e
n
t
6
036, t6042
:
testcases
f
or rename
collision
of already
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-08
E
lijah Newren
t6042: a
d
d tests for
consis
t
ency in file c
o
llision
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-10-22
Eli
j
ah Newren
fsc
k
: move
f
sck_
h
ead_link() to ge
t
_default_heads()
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-10-18
Elijah Ne
w
ren
merge-recursive
:
avoid showing conflicts wi
t
h merge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-10-18
Elija
h
Ne
w
ren
merge-recurs
i
ve: improve aut
o
-mergi
n
g messages with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-09-27
Elijah Newren
commit: fix erroneous BUG, 'mul
t
ip
l
e ren
a
m
es
on the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
merge
-
recursive:
r
ename merge_f
i
le_1() an
d
merg
e
_content
(
)
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
merge-recur
s
ive: remove f
i
na
l
remaining caller of mer
g
e_file
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-09-20
Elijah
N
e
w
ren
me
r
ge-rec
u
rsive:
avoid wrapper function
w
hen un
n
ecessar
y
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-09-20
Elija
h
N
e
w
ren
mer
g
e-recurs
i
v
e
: set paths correctl
y
wh
e
n three-way
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-09-13
Elijah
Newren
sequencer: fix
--allow-empty-messa
g
e behavior,
make
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-09-12
Elijah
N
ewren
updat
e
-ref
:
all
o
w --no-deref with --stdin
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-09-12
Elija
h
Ne
w
re
n
up
d
ate-ref: fix type of
update_
f
lags variable to match
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-09-11
El
i
jah Newren
r
e
rere:
avoid buffer o
v
errun
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-09-11
Elijah Newre
n
t
4
200: demonstrate rerer
e
segfault o
n
sp
e
cially
crafted
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-09-05
Elijah Newren
R
e
move su
p
erfluo
u
s trailing semicolons
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-30
Elij
a
h Newr
e
n
am: avoid direc
t
ory
r
ename d
e
tection when calling re
c
ursi
v
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newren
merge
-
recursive: add ab
i
lity to t
u
rn off directory
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newren
t
3401: add another
d
i
rectory rename testcas
e
for rebase
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-15
E
lijah
N
e
wren
Remove for
w
ar
d
declaration of a
n
enum
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-15
Eli
j
ah Newr
e
n
comp
a
t/preco
m
pose_utf8
.
h: use more c
o
mmon in
c
lude guard
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-15
E
lijah New
r
e
n
urlmatch
.
h:
f
ix include guard
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
M
ove
definition of
e
num branc
h
_track from
c
ache
.
h to
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
a
l
lo
c
: make allocate_al
l
oc_state and clear
_
alloc_state
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-15
E
l
ijah Newren
A
d
d m
i
ssing includes and fo
r
w
ard
d
eclara
t
ions
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-08
E
l
ijah
Newren
gi
t
-update-i
n
dex
.
tx
t
: reword
possibly confusin
g
example
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newre
n
t
7
406: avoid using test_must_f
a
il for
comma
n
ds othe
r
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: prefer te
s
t_* helper f
u
nctions to test -[feds]
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-08
Elij
a
h New
r
en
t7406: avoid hav
i
ng
gi
t
commands up
s
tream o
f
a pipe
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-08
Elija
h
Newren
t7406
:
s
i
mpl
i
fy by us
i
n
g diff --
n
ame-only instead of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-08
E
l
ijah Newren
t7406
:
f
ix
cal
l
that wa
s
f
a
i
l
ing for
t
he
wr
o
ng reas
o
n
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-06
Elijah Newren
t
3031
:
update test
d
e
scription to mention desired behavio
r
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-31
E
l
i
jah
N
ewre
n
r
ea
d
-cache
:
fix
d
irectory/file conflic
t
handling in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-31
Elij
a
h Newren
t101
5
: demonstrate directory/file conflict
r
ecovery
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-27
Elijah
N
ewren
merge-recursive:
p
reserve skip_w
o
rktree bit when
n
ecessary
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t7405: ve
r
if
y
'
me
r
ge
--abort' works
a
f
ter s
u
bm
o
dul
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
N
ewren
t740
5
: add a directory
/
submodule conflict
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
ah New
r
en
t7405
:
ad
d
a
file/submodule
confli
c
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
Newren
merge: fix misleading
pre-merge check documen
t
ation
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
Newren
m
e
rge-recursive: enforce rule that index matches head
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
Elijah N
e
wren
t604
4
:
a
d
d
more te
s
tcases wi
t
h stag
e
d
c
hanges before
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
El
i
j
ah
Newren
merge-recursive: fix ass
u
mp
t
ion that head
t
ree be
i
ng
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah Newren
merge-r
e
cursive: make sure when we sa
y
we abort that
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
El
i
jah Newren
t6044: add a testcase for index
m
atching
h
ea
d
,
w
hen
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
N
e
w
ren
t6036: a
d
d a
failed conflict dete
c
tion case:
r
e
g
u
l
ar
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-06
Elija
h
Newr
e
n
t6036: add lots of detail for directory/file
c
onfl
i
ct
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah N
e
wren
t6042:
a
dd testc
a
se cover
i
ng l
o
ng chains
o
f rename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah
N
e
wren
t604
2
:
add
t
estc
a
se covering r
e
name/
r
ename(2to
1
)/
d
elet
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
Elija
h
Newre
n
t
6042: a
d
d
t
e
s
t
case covering rename/add/de
l
ete conflict
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036:
add
a failed con
f
lict
detect
i
on case with co
n
flicting
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
E
l
i
j
ah Ne
w
ren
t
6036: ad
d
a
f
ailed confli
c
t dete
c
tion cas
e
with submodule
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6
0
36: add a failed conflict d
e
tection case
with subm
o
dule
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t60
3
6
: add a failed conflict dete
c
tion case with
symlink
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
E
l
i
j
ah Newren
t6036: add a fai
l
ed confli
c
t detection case w
i
th symli
n
k
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t
6
044: ver
i
f
y tha
t
merges expected to abort
act
u
ally
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
Elijah N
e
wren
i
n
dex_has_ch
a
n
ges():
avoid
assum
i
ng operating o
n
th
e
_index
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
e
wren
read-cache
.
c
:
mo
v
e
i
n
d
ex_
h
as_changes() from merge
.
c
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
t5407: fix test to cover
inte
n
de
d
argumen
t
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-28
El
i
jah N
e
wren
apply: fix gramm
a
r error in comment
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-27
E
lijah Newren
git
-
rebase-
-
merge: moder
n
ize "git-$cm
d
" to "git $cmd"
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-27
E
l
i
jah Ne
w
ren
Fix use of strate
g
y options w
i
t
h
interactiv
e
rebases
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
t
3418: add tes
t
cas
e
s
howing
p
r
oblems
with rebase -i
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next