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
mingw: safe-guard a bit more against getenv() problems
2019-02-14
Elijah Newren
gi
t
-
r
ebase
.
txt
:
u
p
dat
e
t
o
re
f
lect me
r
ge now
implemented
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
El
i
j
ah Newre
n
gi
t
-sho
w
-ref
.
txt: fix
o
rder of flag
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
Elijah
N
ewren
reba
s
e:
i
mplement
--
m
e
r
g
e via
the intera
c
tive machinery
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah
Newren
rebas
e
: d
e
fine
l
i
ne
a
rization
ordering and enforce it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elij
a
h Newren
git-le
g
acy-re
b
ase
:
simplify unnecess
a
ry
t
r
i
ply
-
nested if
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elij
a
h N
e
wren
git-rebase
,
sequencer
:
exte
n
d --
q
uiet option
for the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
l
ijah Newre
n
am, rebase-
-
merge:
d
o
not
o
ve
r
look --sk
i
p'ed commits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Eli
j
ah
N
ewren
t5407: add a test demonstr
a
ting
how
i
n
t
e
ractive
handles
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah
N
e
w
r
e
n
reb
a
s
e
: fix incompatible opt
i
ons error
mess
a
g
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elij
a
h N
e
w
ren
rebase: make builtin and
leg
a
c
y script error mess
a
ges
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
E
l
ijah
N
ewr
e
n
git-reba
s
e
.
t
xt: update
note about directo
r
y rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-export: add a
-
-show-origi
n
al-ids option to show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
N
ew
r
en
fast
-
i
m
p
ort: remove unmaintained d
u
p
l
ic
a
t
e
d
o
cumentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
Newren
fast-export
:
add --reference-excluded
-
parents option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-ex
p
ort: en
s
ure we export requested refs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
Newren
fast-ex
p
o
rt: when using pa
t
hs,
a
void corrupt
s
tream
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
N
e
wr
e
n
f
a
st
-
e
xport: move commit rewr
i
ting log
i
c into a func
t
io
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ijah Newre
n
fast-exp
o
rt: avoid dying when filterin
g
b
y paths and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
New
r
e
n
fa
s
t
-
export: use va
l
ue f
r
om
correct enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elij
a
h
N
ewren
git-f
a
st-export
.
txt: clarify
misleadi
n
g docume
n
tation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newre
n
gi
t
-fas
t
-imp
o
rt
.
txt: fix docum
e
ntation for --qui
e
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-e
x
port: c
o
nvert sha1 to oid
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newr
e
n
t
6
036, t6043: increase code coverage for fi
l
e
collisi
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Ne
w
re
n
merge-recursive: impro
v
e
rena
m
e/renam
e
(1to2)
/
add[
/
add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merge-re
c
ur
s
ive: use ha
n
dle_file
_
collision for add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
m
e
rge-recursive: improve h
a
ndling for rename/
r
ename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
l
ijah Newren
merge-recurs
i
ve
:
fix r
e
name/add
conf
l
ict handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
m
e
rge-recursive: new function f
o
r better colliding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah
N
e
w
ren
merge-
r
ecursive: increase marker length
w
i
t
h depth
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah New
r
en
t6036,
t
6
042: testc
a
ses for rename c
o
llision
of alre
a
dy
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah N
e
wren
t
6042: add
t
ests for consiste
n
cy i
n
fi
l
e colli
s
ion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-22
E
lijah New
r
en
fsck: move fsck_head_link() t
o
get
_
defaul
t
_
he
a
ds()
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah N
e
w
r
en
merge-recurs
i
ve
:
avoid
showing conf
l
i
c
ts
w
i
th me
r
ge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah Newren
merge-recursive
:
improv
e
a
uto-merging mes
s
a
g
e
s w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-27
E
lijah Newren
commit: fix errone
o
us BUG,
'
multiple renames on the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elij
a
h Newr
e
n
mer
g
e-recur
s
ive: rena
m
e m
e
r
ge_fil
e
_1() and merge_content()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
El
i
ja
h
Newren
merge-
r
ecursive: remove fin
a
l r
e
ma
i
n
i
ng
c
aller of merge
_
file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah N
e
wren
m
e
rge-recur
s
ive: avoid wrapper fun
c
t
ion when un
n
ecessar
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Eli
j
ah Newr
e
n
merge-recursive:
s
et paths correctly
when th
r
ee-way
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
Elijah Newren
seq
u
en
c
er: fix -
-
allow-em
p
ty-message behavior, make
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah Newren
up
d
a
t
e-ref: allow --n
o
-der
e
f with --stdin
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah Newren
update-ref: fix t
y
pe
o
f
u
pd
a
te_flags variable to match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elija
h
Newren
rerere
:
avoid
b
u
f
fer o
v
errun
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Eli
j
a
h
Newren
t
4
200: demonstrate rerer
e
s
egfault on specially crafted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
Elijah Newren
Remove superflu
o
us tra
i
l
i
n
g
semicolons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newren
am: avoid
directory ren
a
me detection when calling re
c
ursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newren
m
erge-recur
s
ive
:
ad
d
ability
t
o
t
u
rn off di
r
ectory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elija
h
Newren
t3
4
01:
add anot
h
er dire
c
tory re
n
ame testcase
f
or reba
s
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
l
ijah Newren
Re
m
ove f
o
rward declarat
i
on of an enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
lijah New
r
en
compat/precompose_utf8
.
h: use mo
r
e co
m
m
o
n
i
n
c
l
u
de
g
u
a
rd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
lijah
Newr
e
n
u
rlmat
c
h
.
h:
f
ix incl
u
de guard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah
Newren
Move defin
i
tion
o
f
enum
b
ranch_t
r
ack from
cac
h
e
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newr
e
n
alloc: make allocate_a
l
loc_
s
tate and clear_all
o
c_s
t
ate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
A
d
d
missing i
n
cludes
and forward declarati
o
ns
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
lijah New
r
en
g
i
t-up
d
ate-index
.
txt: reword possibly confusing
example
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah
Ne
w
ren
t7
4
0
6:
a
v
oi
d
using te
s
t_must_fail for commands oth
e
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah N
e
w
r
en
t7406: prefer test_*
h
elpe
r
fun
c
tions to test -[feds]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah N
e
wren
t
7406: a
v
oid having git commands upstream of a pi
p
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: simplify by usi
n
g diff --name-only instead of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t740
6
: fix call t
h
at was
f
a
ili
n
g for the wrong reason
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Elijah Newren
t3031: upd
a
te
test d
e
scription to mention desired behav
i
or
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elij
a
h
N
ewren
rea
d
-cache:
f
ix directory/file co
n
flict
handling i
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
E
l
ijah Newr
e
n
t1
0
15: demon
s
trate
d
irec
t
ory/file confli
c
t r
e
c
o
very
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
Elijah
Newren
merge-recursive: pr
e
serv
e
sk
i
p_workt
r
ee bit when necessary
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
jah
N
e
wre
n
t7405:
v
eri
f
y
'merge --abort' wor
k
s
a
f
ter subm
o
d
u
le
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elija
h
Newren
t
7405:
a
dd
a direc
t
ory/submodule
con
f
lict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
N
ewre
n
t74
0
5: add a file/
s
ubmodule
c
onfl
i
ct
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
ah Newren
m
erge: fi
x
mislead
i
n
g
p
r
e-merge check do
c
umentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge-recursive: enforce r
u
le th
a
t index matches he
a
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elij
a
h N
e
wren
t6044:
a
dd more testcases w
i
th staged chan
g
e
s be
f
o
r
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah Ne
w
ren
merge-re
c
ursive:
fi
x
assumption th
a
t
head
t
ree bein
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah New
r
en
merge-recursive:
make s
u
re when
w
e say we
abo
r
t that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elija
h
Newren
t6044: add a
t
estcase f
o
r index ma
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 con
f
lict detection case: regular
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elij
a
h Newre
n
t
6
0
36: add lot
s
o
f detail for d
i
rectory
/
file c
o
nflict
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
Newren
t6042: add testc
a
se c
o
ver
i
ng lo
n
g chai
n
s of
r
ena
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
e
wren
t60
4
2: a
d
d testcase covering rename/r
e
n
a
me(2to1)/delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah Newr
e
n
t6042: add
t
e
s
t
c
a
se c
o
vering rename/add/delet
e
conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newre
n
t6036: add a failed conflict detection
cas
e
with conflicti
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t
6
036: ad
d
a fa
i
led c
o
nflict detec
t
ion c
a
se
w
ith submodu
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elija
h
Newren
t
6036: add a
f
ailed confl
i
c
t detection case with s
u
bm
o
dule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036: add a failed conflic
t
d
e
tecti
o
n case with symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah Newren
t6036: a
d
d a failed conflict
d
ete
c
tion case with s
y
mlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
a
h
Newre
n
t6044:
veri
f
y
t
h
at merges expected to abor
t
ac
t
ually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h Newr
e
n
index
_
has_cha
n
g
es(): avoid ass
u
ming operating on the_i
n
dex
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah N
e
wren
re
a
d-
c
ache
.
c
:
move inde
x
_has_chan
g
es() from
m
erge
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
t
5
407: fix test to cove
r
intended argu
m
e
nts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newr
e
n
app
l
y: fix gr
a
mmar error i
n
comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elij
a
h Newren
git-
r
ebase-
-
merge:
mo
d
erni
z
e
"
g
it-
$
cmd" to
"
git
$cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
Fix use of strateg
y
options with interactive rebases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lija
h
Newren
t
3418: add testca
s
e showin
g
problems
wi
t
h re
b
ase
-i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
git-rebase: ma
k
e --a
l
l
o
w
-e
m
p
t
y
-message the default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah Newren
t3401:
a
d
d
di
r
e
ctory rename testcases for rebase and am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
git-reb
a
se
.
txt
:
document
b
eh
a
vioral diffe
r
e
nces bet
w
een
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elij
a
h Newren
dire
c
tory-
r
ename-d
e
te
c
tion
.
txt: technical docs on a
b
il
i
t
i
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newre
n
g
i
t-r
e
ba
s
e
.
txt: address con
f
usion between --no-ff
v
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
El
i
jah Newren
g
i
t-re
b
a
s
e: error out w
h
en inco
m
pa
t
ibl
e
o
ptions passed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
t3422: new
testcas
e
s for checki
n
g when incompatible
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
El
i
jah Newren
g
i
t-re
b
ase
.
sh: u
p
d
a
te h
e
lp
me
s
s
a
g
es a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elija
h
Newren
git-r
e
base
.
txt: documen
t
incompatible options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next