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
update cache for conflicting submodule entries
2009-04-05
C
l
emens Buchacher
update cache fo
r
confl
i
cting submodule entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Clemen
s
Buchache
r
add t
e
sts
for mergin
g
w
ith
sub
m
odules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Ha
m
ano
GIT 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
M
e
r
ge branch '
j
c/maint-1
.
6
.
0
-
blame
-
s'
into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Hamano
Mer
g
e br
a
nch 'js/m
a
i
nt-
d
iff-temp-smudge'
i
nt
o
maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
M
e
rge branch 'js/mai
n
t
-
1
.
6
.
0-exec-path-
e
nv'
i
nt
o
m
aint
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Ham
a
no
Merge branc
h
'bc/m
a
i
nt-1
.
6
.
1-branch-d
e
leted-was' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C
Ham
a
n
o
M
e
r
ge branch 'tr/maint-1
.
6
.
1-doc-form
a
t-patch--root
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C Ham
a
no
M
e
rge b
r
anch 'dm/m
a
int-doc
c
o' into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ham
a
no
M
e
rge bra
n
ch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ha
m
ano
Merge branch
'
maint-1
.
6
.
0'
into m
a
i
nt-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-01
Ho
l
ger Weiß
Do
c
umen
t
ation: Re
m
ove an odd "ins
t
ead"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
J
e
ff King
fix portabil
i
ty pro
b
lem with IS_RUN_COM
M
AND_
E
RR
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Johannes Schindelin
mailmap:
r
esurrect
lower-cas
i
ng of
e
m
a
i
l add
r
esses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Juni
o
C Hamano
U
pdate draft release notes to
1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Jun
i
o
C Hamano
Merge branch
'
m
a
int-1
.
6
.
1' into main
t
commit
|
commitdiff
|
tree
2009-03-30
Jun
i
o C
Hamano
Merg
e
br
a
nch 'maint-1
.
6
.
0'
int
o
mai
n
t
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
D
aniel Ch
e
ng (aka
.
.
.
Fix b
a
sh completi
o
n in
pat
h
wit
h
s
p
aces
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Thomas
R
ast
bas
h
comp
l
etion: only sho
w
'log
-
-
merge' i
f
merging
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
N
i
co -telmich- Scho
t
.
.
.
g
i
t-tag(1): add hi
n
t ab
o
ut commit m
e
ssa
g
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
A
llan C
a
ffee
Documenta
t
i
o
n:
u
pdate
graph api e
x
ampl
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Ham
a
no
Merge branch 'maint-1
.
6
.
1' into main
t
commit
|
commitdiff
|
tree
2009-03-30
Juni
o
C Haman
o
Me
r
ge bra
n
ch 'maint-1
.
6
.
0
'
into mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Er
i
c Wong
git-svn: fix ls-t
r
ee usage wi
t
h da
s
h-prefixed path
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Johan
n
es
S
c
h
in
d
e
l
in
i
m
p
o
rt-zips: f
i
x th
i
nko
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
Merg
e
branch '
m
aint-1
.
6
.
1' int
o
maint
commit
|
commitdiff
|
tree
2009-03-28
E
m
il
Sit
tes
t
-l
i
b: Clean up comments
a
nd
M
akefile
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
T
h
omas Rast
D
ocument
a
t
ion:
f
ormat-pat
c
h
--root cla
r
if
i
cations
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-26
Carlo M
a
rcel
o
Arenas
.
.
.
documentation: update cvsi
m
port description of "-r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-26
D
avid J
.
Mellor
Docu
m
e
n
t
a
tion: Re
m
ove spurious uses
o
f "you" in git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-25
Johannes Sixt
diff --no-
i
ndex: Do
not generate patch
o
u
tp
u
t
if other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-24
Sh
a
wn O
.
Pearce
In
c
re
a
se the size
o
f the die/warning
b
uff
e
r to
avoid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-24
Junio C Hamano
Mer
g
e branch
'
maint-1
.
6
.
1'
i
nto maint
commit
|
commitdiff
|
tree
2009-03-24
Junio C Hamano
Mer
g
e
bran
c
h 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-24
Li
n
us Torval
d
s
clos
e
_
sha1_fi
l
e(): make i
t
easier to diag
n
ose errors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-24
Nicolas Pitre
avoid possible
overflow in delta size fi
l
t
erin
g
comp
u
tation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
David
J
.
M
e
llor
Documentation: minor gramma
t
ical fix in gi
t
-
c
h
e
ck
-
ref
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
D
a
v
id J
.
Mellor
D
o
c
ume
n
tation: minor grammatical fixes in g
i
t-check
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
David J
.
Me
l
lor
D
ocumenta
t
ion
:
minor gramm
a
tical fixes in
g
it-cat-fil
e
.
tx
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
David J
.
Mellor
Doc
u
me
n
tation:
m
inor g
r
ammatica
l
f
i
x
es and re
w
ording
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
D
av
i
d
J
.
M
e
llor
Documentation: remove som
e
uses o
f
the
p
assiv
e
voice
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Junio C
H
amano
Mer
g
e bra
n
ch 'maint-1
.
6
.
1
'
into ma
i
nt
commit
|
commitdiff
|
tree
2009-03-22
J
u
nio C H
a
mano
Merge
b
ranc
h
'maint-
1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-22
Johannes S
c
hin
d
elin
Smudge the
f
iles
fed to ext
e
r
nal d
i
ff and t
e
xtconv
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
D
avi
d
Agu
i
lar
ever
y
d
a
y: use
the da
s
hles
s
fo
r
m
of
g
it-init
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Junio C H
a
man
o
Update
draft release
n
ote
s
to
1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Jeff Ki
n
g
ls-files: require wor
k
tree wh
e
n --del
e
ted is given
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
René
S
charfe
p
i
ckaxe: count regex matches o
n
ly
once
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Ju
n
i
o
C Ha
m
ano
Merge branch 'maint-1
.
6
.
1' into ma
i
nt
commit
|
commitdiff
|
tree
2009-03-22
Juni
o
C Hamano
Me
r
ge
branc
h
'tr/maint
-
1
.
6
.
0-send-email
-
irt' into
m
a
i
nt
commit
|
commitdiff
|
tree
2009-03-22
Junio
C Hamano
M
e
r
g
e branch 'mg/maint
-
submodule-normalize-path' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
J
unio C Hamano
Merge branch '
r
s/memmem' into maint
commit
|
commitdiff
|
tree
2009-03-22
Junio C H
a
mano
Mer
g
e branch '
j
s/rsy
n
c
-local' in
t
o maint
commit
|
commitdiff
|
tree
2009-03-22
J
un
i
o
C Ha
m
ano
Merge
branch '
d
b/maint-missin
g
-origi
n
'
into m
a
int
commit
|
commitdiff
|
tree
2009-03-22
Jun
i
o
C
Hamano
Merge branch
'jc/maint-1
.
6
.
0
-read-tree-overlay' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
J
uni
o
C Ha
m
ano
Merge branch
'js/maint-
1
.
6
.
0-p
a
th-no
r
malize'
i
nto maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
Junio
C Hamano
Merg
e
branch
'
jc/maint-1
.
6
.
0-pack-directory'
i
nto maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
St
e
p
h
en
B
o
y
d
format-patc
h
: -
-
numbe
r
ed-files and
--stdout aren't
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Johannes Sixt
Prop
a
ga
t
e
--e
x
ec-path setting to
extern
a
l
c
o
mmands
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Brandon Casey
git-branch: display "was s
h
a
1
"
o
n branch
deletio
n
rather
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-20
Davi
d
J
.
Mellor
Doc
u
mentation: reword example text in git-bisect
.
txt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-19
Jeff K
i
ng
doc: clarify how -S works
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-19
David J
.
Mellor
Doc
u
me
n
t
a
tion: reworded the "Description
"
section of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-18
Junio C Hamano
blame: r
e
a
d custom grafts giv
e
n by -S
b
efore c
a
lling
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-17
Da
v
id J
.
Mell
o
r
Documentation: minor grammati
c
al fixes in git-
b
ranch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-17
David J
.
Mellor
D
o
c
u
mentati
o
n: minor grammatical fix
e
s
i
n git-blame
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-17
David J
.
Mellor
D
ocume
n
tation: rewo
r
d
the "D
e
scrip
t
ion" section of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-17
Dav
i
d J
.
Mell
o
r
Do
c
umentation:
m
i
nor grammati
c
al fixes in gi
t
-archive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-16
Juni
o
C
H
aman
o
Remove total confusion fro
m
git-
f
etch and
g
it
-
pu
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-15
J
uni
o
C Ha
m
ano
GIT 1
.
6
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
Merge branch 'maint-1
.
6
.
1' into ma
i
nt
commit
|
commitdiff
|
tree
2009-03-13
Ju
n
io C Haman
o
Mer
g
e br
a
nch 'maint-1
.
6
.
0' into ma
i
nt-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-13
Jun
i
o C H
a
mano
Merge
b
ranch 'en/m
a
int-1
.
6
.
1-hash-ob
j
ect' into main
t
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Ham
a
no
Me
r
ge branch 'ks/maint-1
.
6
.
0-mailinfo-folded'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hama
n
o
M
e
rge b
r
anch 'cc/maint-
1
.
6
.
0-
b
i
se
c
t-fix' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Ham
a
no
Merge b
r
a
n
ch 'fg/maint-1
.
6
.
0
-
e
x
c
l
ude-bq'
i
n
to maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C
H
a
mano
Merge branc
h
'
j
s
/
maint
-
1
.
6
.
1
-
f
ilter-branch-
s
ubmodule
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C
Hamano
Merge branch 'g
t
/ma
i
n
t-1
.
6
.
1
-u
t
f8-width' in
t
o
maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
J
u
n
io C Hamano
Mer
g
e branch '
j
s/maint-1
.
6
.
1-remote-remove-mirro
r
'
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Jun
i
o C Hamano
M
e
rg
e
branch
'e
k
/maint-1
.
6
.
1-fi
l
ter-branch-bare
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C
H
amano
Me
r
ge
branch 'jc
/
m
a
i
n
t
-1
.
6
.
1-add-u
-
remove-conflic
t
e
d
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Haman
o
Merge
branch 'js/maint-1
.
6
.
1-rebase-i-su
b
modul
e
' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
Merge bra
n
ch
'
jc/maint-1
.
6
.
1
-
a
llo
w
-uninte
r
esting-missing
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C
Hamano
Merge branch 'ks/
m
aint-1
.
6
.
0-mailinfo-folded'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
J
un
i
o C Hamano
Merge branch 'j
k
/maint-
1
.
6
.
1-cleanu
p
-
after-
e
x
e
c
-failure
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Jun
i
o
C Ha
m
a
n
o
M
erge
branch 'jc/maint-1
.
6
.
0-spli
t
-
d
iff
-
metainfo' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Ham
a
no
read
-
tree A B C: do not creat
e
a bogus in
d
ex
a
nd do
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-12
Thomas Ra
s
t
send-ema
i
l: test
--no-thr
e
ad --in-reply-to combinat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-11
Jun
i
o
C Hamano
Update draft
releas
e
notes for 1
.
6
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-11
Jun
i
o
C Hamano
M
erge b
r
anch
'js/
m
a
i
n
t-send-email' into maint
commit
|
commitdiff
|
tree
2009-03-11
Juni
o
C Hamano
Merg
e
bra
n
ch
'jk/sane-relative-time' into maint
commit
|
commitdiff
|
tree
2009-03-11
Junio C Hamano
Mer
g
e
bran
c
h 'jc/maint-add-p-unquo
t
e' into
mai
n
t
commit
|
commitdiff
|
tree
2009-03-11
Junio C Hamano
Mer
g
e
br
a
n
c
h
'
f
g/maint-exclude-bq' into ma
i
n
t
commit
|
commitdiff
|
tree
2009-03-11
Junio C Hamano
Merg
e
branch 'en/maint-hash-object
'
i
n
to maint
commit
|
commitdiff
|
tree
2009-03-11
Johanne
s
Schindelin
rsync tra
n
spor
t
: allow
local paths, an
d
fix tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-11
Daniel Barkal
o
w
Give error wh
e
n n
o
remot
e
is
c
onfigured
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-08
Junio C Hama
n
o
Merge bran
c
h 'main
t
-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-07
Chris Johnsen
b
u
iltin-revert
.
c: r
e
l
ease i
n
d
e
x
lock when cherry-picking
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-07
Jeff King
document
config --bool-or
-
int
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-07
Jeff King
t
1300:
use test_must_
f
ai
l
as a
p
propriate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next