repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t6022: Add tests for rename/rename combined with D/F conflicts
2010-09-30
Elijah
Newren
t
6
022: Add tests for rename/rename combined wit
h
D
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t
6
022: Add p
a
ired rename+D/F con
f
lict: (t
w
o/
f
i
l
e
,
one
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6
0
22: Add tests with
b
oth rename source &
d
est involved
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ewr
e
n
t6022:
A
dd tests for reve
r
si
n
g or
d
er of m
e
rge
s
when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newr
e
n
t6
0
22: Add test combin
a
t
ions o
f
{content conflict?
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
t6032: Add a te
s
t checkin
g
for excessive
o
utput from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
J
unio C
Haman
o
merge-recursive
:
Rest
r
uc
t
ure showing how to chai
n
m
o
re
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Schalk, Ken
t3030: Add a testcase
f
or res
o
lvable rename/
a
dd conflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
J
u
n
io C Hamano
Merge branch 'en/rename-d-
f
' into en/merge-recursive
commit
|
commitdiff
|
tree
2010-09-18
J
u
n
i
o C Hamano
Git 1
.
7
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-18
Junio
C
Hamano
Me
r
g
e
branch
'
js/l
s
-files-x-doc'
commit
|
commitdiff
|
tree
2010-09-17
Chr
i
s Johnsen
git-
r
ebase--i
n
teract
i
ve
.
sh: rep
l
a
ce
cut w
i
th ${v%% *}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-17
Br
a
n
don Case
y
t/t
7
300
:
w
o
rk
a
round ancient tou
c
h by rearra
n
ging
a
rguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-16
Ju
n
io C
Hamano
Mer
g
e b
r
anch
'bg/fix-t7003'
commit
|
commitdiff
|
tree
2010-09-16
Junio C Ham
a
no
ls-files docum
e
ntatio
n
: rew
o
rd for consistency
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-16
Jay Soffian
git-ls-
f
iles
.
txt: clari
f
y -x/--ex
c
l
ude opti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
Git 1
.
7
.
3 rc2
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
Merge branch
'dr/maint-l
s
-t
r
ee-pref
i
x-recu
r
sion-fix
'
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
Merge
b
ranch 'os
/
fix-rebase-di
f
f-no-p
r
efix'
commit
|
commitdiff
|
tree
2010-09-15
Jun
i
o C Ham
a
no
M
erge branch 'jl
/
fix-test'
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
Merge branch 'c
h
/
f
ilt
e
r-bra
n
ch-depr
e
c
a
te-re
m
a
p
-
to-ancestor'
commit
|
commitdiff
|
tree
2010-09-15
Junio C Ham
a
no
Merge branch
'ch/maint-
c
annot-
c
r
eate-
b
undle-error'
commit
|
commitdiff
|
tree
2010-09-15
Ju
n
io
C
H
am
a
no
Merge branch
'
ks/recurs
i
ve-
r
ename-add-
i
dentical'
commit
|
commitdiff
|
tree
2010-09-15
Junio C Haman
o
Merge
git://re
p
o
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2010-09-13
Brian G
e
rnhardt
t70
0
3
:
Use test_
c
o
m
mit instead of cus
t
o
m
fun
c
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-12
J
u
nio C Ha
m
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-09-12
Juni
o
C
Hama
n
o
l
s
-tree $di $di
r
:
do not mistakenly
r
e
cur
s
e in
t
o directories
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-12
Junio C Hamano
t3101: modernise style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-12
Ramsay Jones
vcs-svn: Fix some
p
r
intf format compi
l
er warning
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-11
Ren
é
Scha
r
fe
c
o
mpat/nedmalloc: do
n
't force NDEBUG
o
n the rest
o
f
git
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
J
unio C Hamano
Git 1
.
7
.
3
r
c1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Junio C Hamano
Mer
g
e b
r
anch 'np/relnotes-in-subdir'
commit
|
commitdiff
|
tree
2010-09-10
Jun
i
o C H
a
m
a
n
o
Pr
e
pare for
1
.
7
.
3 rc1
commit
|
commitdiff
|
tree
2010-09-10
Junio C Hamano
Merge b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2010-09-10
M
a
rk Lodato
co
n
fig
.
t
x
t: fix placem
e
nt of d
i
f
f
.
noprefix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
B
r
a
ndon C
a
sey
t/t4
0
18:
a
void two unn
e
cessary sub-shel
l
inv
o
cations
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Jun
i
o C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-09-10
Brandon Casey
t/t4018:
tes
t
whether
the word_regex
p
atterns
compile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
B
r
andon Casey
x
d
iff-inte
r
face
.
c: always trim trailing space
f
rom
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
B
rando
n
Casey
diff
.
c: call re
g
free t
o
free memory allocated b
y
regco
m
p
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
B
randon
Ca
s
ey
t/
t
5510-f
e
t
c
h
.
sh:
imp
r
ove t
e
sting with expli
c
it
U
RL
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Brandon Casey
builtin/fetch
.
c: comment that
branch-
>
remo
t
e
_
name is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Brand
o
n Casey
M
ak
e
file:
u
se compat
r
eg
e
x on IRIX 6
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
B
r
a
n
don Casey
t/t7008: w
o
r
k
around broken handlin
g
of \000 by prin
t
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Oded Sh
i
mo
n
A
d
d --s
r
c/dst-prefi
x
to git
-
f
o
rmt-patch in git-rebase
.
s
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Elijah Newren
merge-recurs
i
ve
:
D
/F con
f
licts where was_a_dir/file
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Elijah
N
e
w
ren
t
3
5
0
9: Add rename + D/F conf
l
ict testcase th
a
t recursive
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Ju
n
io C Hamano
i
n
s
tall-webdoc: keep
i
nstall
e
d RelNotes-*
.
t
xt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Jens Lehmann
t1020
:
Get
r
i
d
of 'cd "$HERE"' at the
start of
e
ach
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Jo
n
a
t
han Nied
e
r
t20
1
6 (ch
e
ckout
-
p
): add missing &&
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Jona
t
han Nied
e
r
t1302 (c
o
r
e
.
re
p
osi
t
or
y
version): s
t
yle tweaks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Jonath
a
n
N
i
e
d
er
t21
0
5 (gi
t
file):
a
dd mis
s
ing &&
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Jonatha
n
N
i
e
der
t
1
4
50 (fsck):
r
emove d
a
ngling objects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Jonatha
n
N
i
eder
t
ests: subshell
indentation style
f
ix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-08
J
un
i
o C Hamano
M
erge
bran
c
h 'tf/cleanup-buil
t
in-hel
p
-headers'
commit
|
commitdiff
|
tree
2010-09-08
Juni
o
C Haman
o
M
e
r
ge br
a
nch 'jk/
t
est-must
-
fail-missing'
commit
|
commitdiff
|
tree
2010-09-08
J
unio C H
a
mano
Merge b
r
anch 'jh/error-rem
o
v
ing-m
i
s
sing-note'
commit
|
commitdiff
|
tree
2010-09-08
J
unio C Hamano
Merge
b
ranch 'kf/a
s
kpas
s
-
config'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
M
e
rge branc
h
'bc/main
t
-fe
t
ch-url-only'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Merge branc
h
'jk/maint-pass
-
c-c
o
nfig-
i
n-env'
commit
|
commitdiff
|
tree
2010-09-08
Junio
C
H
amano
Merge bra
n
ch
'e
n
/d-f-co
n
f
l
i
c
t-fi
x
'
commit
|
commitdiff
|
tree
2010-09-08
Jo
h
ann
e
s
Sixt
fast-export: ensure th
a
t
a renamed file is pr
i
nted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-07
Nicolas Pitre
Docu
m
ent
a
tion
:
m
o
ve
R
elNo
t
e
s
into a directory
of the
i
r own
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-07
J
u
nio C Haman
o
Merge branc
h
'main
t
'
commit
|
commitdiff
|
tree
2010-09-07
Elijah
N
e
w
re
n
r
evert: Fix t
r
i
v
i
al
c
omment style
issue
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-07
Elijah Newren
cache_tr
e
e
_free:
Fix sm
a
l
l memory leak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-06
Junio C Hamano
Merge
b
ranc
h
'jh/clean-exclude'
commit
|
commitdiff
|
tree
2010-09-06
Thi
a
g
o Farina
builtin/clean
.
c: Use S
T
RING_LIST_INIT_NOD
U
P
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-06
Junio C Ham
a
no
Merg
e
branch
'jl/maint-fix-t
e
st'
commit
|
commitdiff
|
tree
2010-09-06
Jen
s
Le
h
man
n
Sev
e
ral tes
t
s: cd
i
nsi
d
e subshell
i
n
s
t
e
ad of aroun
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-06
Jens L
e
hmann
t3404
&
t7508: cd i
n
s
ide subshell ins
t
ead
of a
r
o
u
nd
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-06
J
unio C Hamano
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-09-06
J
uni
o
C Hamano
M
e
rge br
a
nc
h
'xx/trivial' into m
a
i
nt
commit
|
commitdiff
|
tree
2010-09-06
Junio C Hamano
t
a
g
.
c: whit
e
space breakages fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-06
Ja
r
ed Hance
F
i
x whitespace issu
e
in obje
c
t
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-06
Jens Le
h
man
n
t5505: add missing &&
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-04
Junio C Hamano
Merge branch 'jl/submodule-ignore-diff'
commit
|
commitdiff
|
tree
2010-09-04
Junio C Hamano
M
e
rge branch
'
ab
/
test
-
2'
commit
|
commitdiff
|
tree
2010-09-04
Jun
i
o C Hamano
Merge branch '
j
s/deta
c
h
e
d-
s
tash'
commit
|
commitdiff
|
tree
2010-09-04
Junio C Ha
m
a
n
o
Merg
e
branch '
j
s/maint-
r
e
flog-beyond-horizon'
commit
|
commitdiff
|
tree
2010-09-04
Junio C H
a
mano
Merg
e
br
a
nc
h
'dg/loca
l
-mo
d
-
er
r
or
-
messages'
commit
|
commitdiff
|
tree
2010-09-04
Junio C H
a
ma
n
o
Merg
e
b
r
a
nch 'nd/maint
-
fix-replac
e
'
commit
|
commitdiff
|
tree
2010-09-04
Nguyễn
T
hái Ngọc Duy
p
a
rse_object
:
pass on th
e
original sha1
,
no
t
th
e
repl
a
ced
one
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Schalk, Ken
RE
:
[PATCH] A
v
o
i
d ren
a
m
e
/ad
d
confli
c
t wh
e
n c
o
nt
e
n
t
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Junio
C
Haman
o
Merge
b
ranc
h
'ab/compat-regex'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Me
r
ge
branch 'nd/clone-depth
-
z
ero'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hama
n
o
M
erge b
r
anch 'jn/m
a
int-doc-user-manual-html
-
doctype'
commit
|
commitdiff
|
tree
2010-09-03
Junio C
H
amano
Merge b
r
anch
'cb/maint-me
r
get
o
ol-no
-
tty
'
commit
|
commitdiff
|
tree
2010-09-03
Ju
n
io C Hamano
Merg
e
b
ranch 'jn/a
p
ply-fil
e
name-with-sp'
commit
|
commitdiff
|
tree
2010-09-03
Junio C
Hamano
Merge
b
ranch 'jn/merg
e
-c
u
s
tom-n
o
-trivi
a
l'
commit
|
commitdiff
|
tree
2010-09-03
Ju
n
io C Hamano
Mer
g
e branch 'jc
/
maint-doc-em-dash'
commit
|
commitdiff
|
tree
2010-09-03
J
u
nio C
H
amano
Merge branch
'mg
/
doc-bundle'
commit
|
commitdiff
|
tree
2010-09-03
Ju
n
io C Ham
a
no
Merge branch 'jn/doc-b
a
c
kslash'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge
b
ranch 'jn
/
update-contrib-exampl
e
-merge
'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
M
er
g
e bran
c
h
'
jn/merge-renormalize'
commit
|
commitdiff
|
tree
2010-09-03
Junio
C Ha
m
an
o
Sync with 1
.
7
.
2
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
J
u
nio C Hamano
Git 1
.
7
.
2
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Thiago F
a
rina
builtin/merge
_
recu
r
sive
.
c: Add an usag
e
stri
n
g and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Jens Lehmann
t7406 &
t7407: add missing && at end o
f
lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
J
e
ns Lehmann
t740
5
:
cd
i
nside su
b
shell ins
t
ead
o
f arou
n
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next