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
Merge branch 'maint-1.6.4' into maint-1.6.5
2010-07-26
Juni
o
C Ha
m
ano
Merge
branch '
m
ai
n
t-1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-07-25
Greg Brockman
C
h
eck siz
e
of pa
t
h buffer before
w
riting in
t
o it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Uwe
Kleine-König
rev-parse
:
f
ix
-
-
p
a
r
s
e-opt
-
-kee
p
-
d
ash
d
ash --stop-at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-05
Michal Sojka
Remove ext
r
a '-' from git-am(1)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-16
Jeff King
d
wi
m
_ref: fix dangling symref warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-16
Thomas Rast
stash pop: remov
e
'
a
p
ply' op
t
ions during 'drop' invocati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-16
Larry D'
A
nna
diff: make sure --output=/
b
a
d
/path i
s
c
aught
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
t8003: check e
x
it code of command and error
message
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-09
Jay S
o
f
f
ian
bla
m
e: pr
e
vent a segv w
h
en
-
L
g
ive
n
st
a
rt > EOF
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Junio C
H
am
a
no
Merge bra
n
ch 'sb/
m
aint-oc
t
opu
s
' into main
t
-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-02-01
Junio C
Hamano
Me
r
ge branch 'bg/maint-
a
dd-all
-
doc' into main
t
-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-29
Jeff Ki
n
g
fix memcpy of o
v
erlapping area
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Haman
o
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Mer
g
e bra
n
ch 'jk/maint-1
.
6
.
5-reset-
h
a
rd' into ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
H
a
m
ano
Merge branch 'tr/maint-1
.
6
.
5
-
bash-pro
m
pt-show-
s
u
b
module
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge branch 'dp/maint-
1
.
6
.
5-fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge branch 'jm/maint
-
1
.
6
.
5
-
gre
p
-NUL-te
r
minate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branc
h
'maint
-
1
.
6
.
4
' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hama
n
o
Merge b
r
anch
'main
t
-1
.
6
.
3' into ma
i
nt
-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
M
erge branch
'
m
a
int-1
.
6
.
2
'
i
nto maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
J
un
i
o
C
H
amano
Merge
commit 'v1
.
6
.
4
.
4-8-g8de6518'
i
n
to
m
aint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Fi
x
mis-backp
o
rt of t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Jim Me
y
e
r
ing
g
r
ep: NUL
terminate inp
u
t
f
rom a file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Dmit
r
y Potapov
f
a
s
t-i
m
po
r
t: ta
g
may
p
oint
t
o any object
t
ype
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Ju
n
i
o C Hamano
M
erge bra
n
ch 'maint-1
.
6
.
1' into maint
-
1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Jun
i
o C Hama
n
o
Merge branch 'm
a
in
t
-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-10
Andre
a
s Gruenbacher
base85:
Make
the c
o
de
m
ore obvious instead of explaining
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
And
r
eas Grue
n
bacher
ba
s
e85: encode_8
5
() does not use t
h
e decode tab
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Andreas
G
r
uenba
c
her
base8
5
d
ebug code:
Fi
x
length
b
yte calcu
l
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
Björn G
u
stavsson
git-r
m
doc: Describe how to
s
ync
index & work
t
ree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
Ju
n
io
C Haman
o
checkout -m:
d
o
not try to f
a
l
l
back
to
--
m
erge from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-31
Matthieu Moy
branch: die explicitly why
whe
n
calling "gi
t
branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-31
Thomas Rast
b
a
sh
c
ompletion: factor submodules into dirty state
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Jeff King
textc
o
nv
:
stop
l
e
aking file descrip
t
ors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Je
f
f King
reset: un
b
re
a
k hard
r
esets w
i
th GIT_WORK_TREE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Junio C Ha
m
ano
Merge branch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-30
G
r
eg Pric
e
co
m
mit: --c
l
e
a
nup is a
m
essage o
p
t
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
A
n
dre
a
s
Schwab
git count-object
s
: handle packs
b
igger tha
n
4G
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
N
guy
ễ
n Thái Ngọc Duy
t
7102: mak
e
t
he
t
est fail if
o
ne of its check f
a
ils
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
David Reiss
P
reve
n
t git blame from se
g
faulting o
n
a miss
i
ng author
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Bj
ö
r
n
Gustav
s
son
r
e
b
ase -i: abort c
l
eanly if the editor fails
t
o lau
n
ch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Boyd
tec
h
nica
l
-docs:
document hash API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephen
Bo
y
d
api-s
t
rbuf
.
txt: fix t
y
pos and document laun
c
h_edito
r
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C H
a
mano
Git 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Ju
n
io C Hamano
w
o
rktree: don
'
t segfault with an absolute pathspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Jeff King
ignore unkn
o
w
n
color conf
i
guratio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Johannes Sixt
help
.
autocorre
c
t: do n
o
t
r
un a command if the co
m
m
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-15
Nanak
o
Shira
i
shi
Illustrate
"filter
"
attribute with an exam
p
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-14
Stephen Boyd
octopus:
remove dead code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-14
Stephen
B
oyd
octopus: r
e
e
n
able fast-forward merges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-14
Steph
e
n Boyd
octopus: make merge proce
s
s sim
p
ler
to fo
l
l
ow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C H
a
m
ano
Gi
t
1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C
Ha
m
a
no
Fix ar
c
hive format with -- on the com
m
a
nd
l
i
n
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Juni
o
C H
a
m
a
n
o
Rem
o
ve pos
t
-upload-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hama
n
o
Merge branc
h
'mm/maint-merge-
f
f-
e
rror-mess
a
g
e
-
fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
unio C H
a
mano
Merge branc
h
'jn/m
a
int-pu
l
l-rebase-err
o
r-messag
e
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Hamano
Merge br
a
n
ch 'jk/maint-add-p-
d
e
l
ete-fix
'
in
t
o maint
commit
|
commitdiff
|
tree
2009-12-08
Jeff King
add-interacti
v
e:
fix
d
e
l
etion of n
o
n-empty files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-07
Björn Gust
a
vsso
n
git-add/rm doc:
Consi
s
te
n
t
l
y back-quote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-07
Björn
G
u
st
a
vsson
Documentatio
n
: 'gi
t
add -A
'
can remove files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C H
a
man
o
Gi
t
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
L
i
nus Tor
v
alds
Fix diff -
B
/--dirsta
t
m
i
scounting
o
f newly adde
d
contents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jeff
K
i
n
g
reset:
i
mp
r
ove worktree saf
e
ty val
v
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zull
i
nger
Documentation: Av
o
id use of xmlto --stringp
a
r
am
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
René Scharfe
ar
c
h
i
ve: cla
r
if
y
description
of path pa
r
a
me
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
rere
r
e:
d
on't segfault on failure
to ope
n
rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Prepare for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
a
m
ano
Merge branc
h
'
uk/m
a
int-s
h
ort
l
o
g-enc
o
ding' into m
a
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
M
erge b
r
anch 'fc/maint-form
a
t-pa
t
ch-pathsp
e
c
-
dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
ranch
'
ap
/
m
aint-me
r
ge-
s
tr
a
tegy-list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge branch 'jc/maint-am-keep' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hama
n
o
M
erge
branc
h
'
rs/work-around-grep-op
t
-ins
a
nity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
r
a
nch 'rj/maint-cygwin-count
-
obje
c
t
s' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
bra
n
ch '
m
m/maint-hint-failed-merge' i
n
to m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e branch 'th/
m
aint-
r
emote-upd
a
te-help-string' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merg
e
bran
c
h
'
rj/maint
-
t9700'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Merge
b
r
a
nch '
l
s
/
maint-m
a
ilinf
o
-no-inbody'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'mo/maint-crlf-doc' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bran
c
h
'
t
h/remo
t
e-usage
'
in
t
o m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge bran
c
h 'pb/maint-use-cus
t
om-pe
r
l' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Merg
e
bra
n
c
h
'mm/co
n
f
i
g-pathname-til
d
e
-
e
xpand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge branch '
b
c
/
grep
-
i-F' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Ham
a
no
Merge bran
c
h
'
j
k/maint-break-renam
e
-re
d
uce-memor
y
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merge branch 'rj/maint-simp
l
i
f
y-
c
ygwin-makefile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erge br
a
nch
'
rg/doc-workflow' i
n
to
ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
M
erge branch 'np/maint-sideband-
f
avor-st
a
tus' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Documentatio
n
: xmlto 0
.
0
.
18 does not know --s
t
ringpa
r
am
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Bra
n
don Casey
t4201: use ISO
8
859-1 rather than
I
SO-8859-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
an Krüger
pull: clarify advic
e
for the uncon
f
igure
d
error case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
G
i
t 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C
Hamano
U
nconditional
l
y
s
et
man
.
base
.
url
.
fo
r
.
relative
.
l
inks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Documentation/Ma
k
e
f
ile:
a
llow man
.
base
.
url
.
f
o
r
.
relative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C
H
ama
n
o
Prepare
for 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ha
m
a
n
o
mer
g
e: do not add standard message when message is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C Hamano
Do not m
i
sidentify "git merge foo HE
A
D" as an old-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
h
e
l
p: Do
not unnecessari
l
y
look
f
or a
r
epositor
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
M
i
chael J Grube
r
D
o
cumen
t
a
t
ion: Fix
a
f
e
w
i
.
e
.
/e
.
g
.
mix-
u
ps
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
D
a
vi
d
Soria Parra
Documentatio
n
: Document
--
b
ranch option in git cl
o
ne
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
M
atthieu Moy
b
u
iltin-m
e
rge: show
user-fr
i
endly
error messages for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu Mo
y
me
r
ge-recu
r
siv
e
: make the
e
rro
r
-
m
essa
g
e generat
i
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next