repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
RE: [PATCH] Avoid rename/add conflict when contents are identical
2010-09-03
Schalk, Ken
R
E: [PA
T
C
H
] Avoid rena
m
e/
a
dd
c
onf
l
ict whe
n
conte
n
ts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
J
unio C Hamano
Prep
a
re
for 1
.
7
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
Junio C
Ham
a
no
Me
r
ge bra
n
ch 'gp/pa
c
k-refs-remove-empty-dirs' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Junio C H
a
mano
M
e
r
ge b
r
anch 'sg/re
r
ere-gc-old-still-used
'
into maint
commit
|
commitdiff
|
tree
2010-09-01
Juni
o
C H
a
mano
M
e
r
g
e
bra
n
ch 'np/mai
n
t-huge-
d
elta-gener
a
tion' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Junio C Ham
a
no
Merge br
a
nch 'dj/
f
etch-tagop
t
' into maint
commit
|
commitdiff
|
tree
2010-09-01
Juni
o
C
H
amano
Me
r
ge branch 'da/fi
x
-s
u
bm
o
dule-
s
ync-supe
r
project-co
n
fig
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
Merge bra
n
ch '
e
n/rebase
-
against-reba
s
e-fix'
int
o
maint
commit
|
commitdiff
|
tree
2010-08-30
J
u
nio C Hamano
Me
r
ge branch 'm
a
int-1
.
7
.
1' into maint
commit
|
commitdiff
|
tree
2010-08-30
Matt
h
i
e
u
Moy
t0003:
add missin
g
&
&
at end of lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-26
Ja
y
Soffian
fo
r
-each-ref: fix objectn
a
me:short b
u
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-25
Elijah Newren
tree
-
wa
l
k:
Correct bitrotted
c
o
mment abou
t
t
ree_entry()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-25
Linus T
o
rvalds
Fix '
g
it log
'
early pager startup erro
r
ca
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
J
onathan N
i
ede
r
par
s
e-options: clarify PARS
E
_OPT_
N
OAR
G
description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Jonathan
N
ieder
t
3302 (not
e
s): Port
t
o
Solar
i
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Ralf Wildenhues
Typos in code comment
s
, an err
o
r message, doc
u
mentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
N
i
c
olas P
i
tre
fix >
4
GiB
sou
r
ce delta asser
t
io
n
failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
J
e
ns Lehmann
t
7
403: add missing &&'
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Mark
Rada
Tel
l
ignore file abo
u
t ge
n
erate
f
iles in /g
i
tweb/static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
J
u
nio
C
Hamano
Merge br
a
n
c
h 'jc/maint-
f
ollow-r
e
name-fix'
i
nto maint
commit
|
commitdiff
|
tree
2010-08-20
Ju
n
io C
H
a
mano
Me
r
ge bran
c
h 'jn/maint-plug-l
e
ak'
in
t
o
maint
commit
|
commitdiff
|
tree
2010-08-20
Junio
C
Hama
n
o
Merge
bra
n
ch 'jn/
f
ix-abbrev' in
t
o maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
M
e
rge
branch '
v
s/doc-spell' into main
t
commit
|
commitdiff
|
tree
2010-08-20
Junio C H
a
m
a
n
o
Merge branch
'
jn/reba
s
e
-
rename
-
am' into maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge branch 'jn/
d
oc-pull' int
o
maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C
H
amano
M
erge branch 'bc/use-more
-
hardlinks-in-inst
a
ll' into
.
.
.
commit
|
commitdiff
|
tree
2010-08-20
Junio C Ha
m
ano
Merge branch 'tr/rfc-rese
t
-do
c
' into maint
commit
|
commitdiff
|
tree
2010-08-20
Matthi
e
u Moy
x
m
alloc:
i
n
c
lu
d
e
si
z
e
in the failure message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Junio C Hamano
Git 1
.
7
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Juni
o
C Hama
n
o
Merge branch 'tr/
x
size-bits' i
n
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2010-08-19
Junio C Ham
a
no
Merge branch 'jc/sha1-name-
f
i
n
d
-fix' into
maint
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'sp/fix-smart-h
t
t
p
-deadlock
-
on-error'
.
.
.
commit
|
commitdiff
|
tree
2010-08-18
D
a
vid Agu
i
l
ar
submo
d
ule sync:
Update "submodule
.
<
n
am
e
>
.
u
r
l
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Æ
var Arnfjörð Bjarmason
log:
t
est for
regres
s
ion intr
o
duced in v1
.
7
.
2-rc0~103^2~2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Daniel John
s
on
fetch:
a
llow
c
ommand line --tags to override
c
onfig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
d
i
ff --fo
l
low: do cal
l
diffcore_std() as
n
ecessa
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
diff --follow: do not was
t
e
cyc
l
es while recursin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
pul
l
-
-rebase: Avoid
spurious conflic
t
s a
n
d reapply
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
t5520-pull: Add testcases
s
howing spurious conflicts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Matthieu
M
oy
pus
h
: m
e
ntion "git pull" in
e
r
r
or
me
s
sage for non
-
fas
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
Jonatha
n
Nied
e
r
S
tandardize do {
.
.
.
} w
h
ile
(
0
) style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
B
r
andon Casey
t/t7003: replace \t with litera
l
t
ab in sed expression
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
Nels
o
n Elhage
index-pack: Do
n
'
t
follow replace
r
efs
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Matthieu
Moy
post-receive-email:
r
em
o
ve s
p
urious commas in email
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Raja R H
a
rinat
h
fast-
i
mp
o
rt: export
c
orrectly m
a
r
k
s larger th
a
n 2^20-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Ævar
Arnf
j
ö
r
ð
Bjarma
s
o
n
t/lib-git-svn
.
sh: use $PERL_PATH for pe
r
l, not pe
r
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
J
onathan N
i
ede
r
write-tree
:
Avoid
l
eak whe
n
inde
x
refers to an invalid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
J
onath
a
n Niede
r
read-t
r
e
e: stop
l
eaking tree objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
J
onathan Nieder
core: Sto
p
leakin
g
ondisk_cache_e
n
t
rys
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jaku
b
Nareb
s
ki
diff: strip extra "/" when str
i
p
p
i
n
g pref
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Nieder
gitweb: clari
f
y
s
e
arch result
s
page when no
matching
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonatha
n
Nieder
Docu
m
entation: a
d
d
a
F
ILES s
e
c
t
ion for show-ref
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonath
a
n Nieder
M
akefile: add mi
s
sing
d
epen
d
ency on
http
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Jo
n
at
h
a
n Nieder
M
a
kefile:
a
dd mis
s
ing
de
p
end
e
ncies on
url
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Mi
c
hael J
Gruber
Do
c
u
m
e
n
t
ation
/
g
it-log: Clarif
y
--f
u
l
l-dif
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Willy Tarreau
git-reb
a
se:
f
ix typo
w
hen pars
i
ng
-
-force
-
rebase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Ævar Arn
f
jörð Bjarm
a
son
i
m
ap-send: Fi
x
sprintf
u
sage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Ren
é
Scharfe
prune
:
allo
w
--d
r
y-run for -n and --verbose
f
or -v
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Re
n
é
S
charfe
notes: allow --
d
ry-run
for -n
a
nd
-
-verbose
f
or
-v
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Matthieu Moy
Document -B<n>[/<m>], -M
<
n
>
and -C<n> vari
a
nts of
.
.
.
from the explanations of
Junio C Hamano
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Brad
Kin
g
Document
a
tion:
c
i
t
e g
i
t-am
from git-apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
T
hom
a
s
R
ast
t7003:
f
i
x
s
u
b
d
i
r
e
ctory
-
filter te
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Sha
w
n
O
.
Pea
r
ce
smart-htt
p
:
D
on't d
e
adloc
k
on
s
erver failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Niede
r
Allow "check-ref-
f
ormat --branch"
f
r
om subdi
r
ectory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan N
i
eder
check-
r
ef-
f
o
r
m
at: handle subcommands in se
p
arate functi
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-05
Matt
h
i
e
u Moy
prett
y
-options
.
txt: match --format's documentation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-03
Junio C Ha
m
ano
Merg
e
bran
c
h 'sv/maint-diff-q-clear-f
i
x'
into
m
aint
commit
|
commitdiff
|
tree
2010-08-03
Junio C Hamano
Merge b
r
anch
'
rr
/
svn-fe' into mai
n
t
commit
|
commitdiff
|
tree
2010-08-03
Juni
o
C Hamano
Merge branch
'
pt
/
git-gui'
into maint
commit
|
commitdiff
|
tree
2010-08-03
Ramkuma
r
Ramachandra
contrib/svn-
f
e: Ad
d
the svn
-
f
e target
t
o
.
g
i
t
ign
o
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-03
R
amk
u
m
a
r
Ramachandra
contrib/svn-fe: Fix Incl
u
deP
a
th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Jon
a
t
han Nieder
Documentation: flesh
o
ut “git
p
u
l
l” des
c
ription
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Junio
C
Ha
m
ano
sha1_name
.
c: fix p
a
r
s
ing of ":/
t
oken" sy
n
tax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
J
u
nio C Hamano
Merge branch 'ab/ta
p
'
in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2010-08-02
Ævar Arnfjörð Bj
a
r
m
a
s
o
n
test-lib: Remove 3 year old no-op
-
-no-pyt
h
on optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Ævar Arnfjörð Bjarmason
test-lib
:
Ignore --quiet under a TAP harness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Hamano
M
e
rge git:/
/
r
epo
.
or
.
cz/git-gui int
o
pt/git-gui
commit
|
commitdiff
|
tree
2010-08-02
Thomas Rast
Documentat
i
on
/
r
e
v-pars
e
: q
u
otin
g
is required with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Jun
i
o C Hamano
D
o
cumenta
t
ion:
r
eporting b
u
g
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
J
unio C H
a
mano
Fix DIF
F
_QU
E
UE_
C
LEAR refactoring
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-28
Th
o
mas Rast
xsize_
t
: check whether
we lose bits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-28
David D
.
Kilzer
Fix git rebase
-
-co
n
tinue to work with touched files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-28
Matthieu Moy
Document ls-files -t
a
s
s
e
mi-obsole
t
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Junio C Hama
n
o
G
i
t
1
.
7
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Jun
i
o C Hamano
Sync wit
h
1
.
7
.
1
.
2
commit
|
commitdiff
|
tree
2010-07-27
J
u
nio C Haman
o
G
i
t
1
.
7
.
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Jun
i
o
C Ha
m
ano
Sync with
1
.
7
.
0 series
commit
|
commitdiff
|
tree
2010-07-27
Junio C Ham
a
no
Gi
t
1
.
7
.
0
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nied
e
r
examples
/
commit:
us
e
-
-
abbrev
f
or c
o
mmit summ
a
ry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
J
onatha
n
Nieder
checkout,
commit: rem
o
ve confus
i
n
g assignments to rev
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nieder
a
r
chive: a
b
brevi
a
t
e subs
t
ituted co
m
mit ids aga
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan
Nieder
c
onfig --get --path: check
f
or unset $HOME
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Stephen
B
oyd
c
o
mmit: re
m
ove
full st
o
p fr
o
m us
a
ge help for -u
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Matthieu Moy
Clarify help message when no rem
o
te is specified
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Thomas Rast
Ma
k
efile
:
add check-doc
s
exception
for gi
t
revisions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Thoma
s
Rast
Fix 'git' wrap
p
er usage
string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Thomas
Rast
D
ocumentat
i
on/git-push: Expl
a
in status
output
in more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Thomas R
a
st
Docu
m
ent re
c
eive
.
denyDelete
C
u
r
rent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
Cast
e
x
e
cl*() NULL sentinels t
o
(cha
r
*)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Nguyễn Thái Ngọ
c
Duy
git-rea
d
-
tree
.
txt: ack
n
owledg
e
t
h
e direc
t
ory matchi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next