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-01-19
Junio C
H
amano
M
erg
e
branc
h
'maint-1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Merge br
a
nch
'
maint-1
.
6
.
3' into
main
t
-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge b
r
anch
'
maint-1
.
6
.
2' into
m
aint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
aman
o
Merge commi
t
'v1
.
6
.
4
.
4-8-g8de6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Fix mis-backpo
r
t of t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Junio
C
Haman
o
Merge b
r
anch 'm
a
int-1
.
6
.
1
'
into ma
i
n
t
-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Ju
n
i
o C Hamano
Mer
g
e
branch 'maint-1
.
6
.
0' into
mai
n
t-
1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-10
Andreas Gruenbacher
b
ase85: Ma
k
e th
e
cod
e
more obvious instead of
ex
p
la
i
n
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Andreas Grue
n
bac
h
er
b
ase85
:
encode_85() does not us
e
the dec
o
de tabl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Andreas Gruenbacher
base85 debug code
:
Fix lengt
h
byte calcu
l
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
J
u
nio C Ha
m
ano
c
h
e
ckout -m: do not try
t
o fall bac
k
to --merge
f
rom
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-31
Matthie
u
Moy
branch: die exp
l
icitly why when
c
alling "git branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Jeff King
textco
n
v
:
stop leaking file descriptors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Junio C Hamano
Merge bran
c
h 'main
t
-1
.
6
.
0'
into
m
aint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-30
Greg Price
commit
:
--c
l
eanu
p
is a
m
e
s
sage optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
A
n
dreas Schwab
git count-objects: han
d
le packs b
i
g
g
er than
4G
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Ng
u
yễn Thái Ngọc Duy
t7102: make
t
he test fail if one o
f
its c
h
e
c
k
fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
D
avid
R
eiss
Prevent git blam
e
from
s
egf
a
ulting on a missing aut
h
or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Björn Gustavsso
n
rebase -i: abort cleanly i
f
t
he editor fails to laun
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Step
h
en Bo
y
d
technical-docs:
d
ocume
n
t hash API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephen
B
oyd
a
pi-strbuf
.
txt: fi
x
t
ypos
and document launch_e
d
itor()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Gi
t
1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Ham
a
n
o
worktree:
d
on'
t
segfault with an abso
l
ute path
s
pec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Jeff K
i
n
g
ignore unkn
o
w
n
col
o
r confi
g
urati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Joh
a
nne
s
S
ix
t
help
.
au
t
ocor
r
e
c
t: do not run a
command if
t
h
e com
m
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-15
Nanako Shira
i
shi
Illustrate "fil
t
e
r
" attrib
u
te with an exampl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C H
a
mano
G
i
t
1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
F
i
x archi
v
e forma
t
with -- on the co
m
mand line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio C Hamano
Remove pos
t
-uploa
d
-h
o
o
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C
Hamano
Merge
b
ra
n
ch
'mm/ma
i
n
t
-merge
-
f
f-er
r
o
r
-
m
essage-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
man
o
Merge branch 'jn/maint-pull-
r
e
b
ase-error-messa
g
e' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C Hamano
Merge br
a
nch 'jk/maint-add-p-delet
e
-fix' into
m
aint
commit
|
commitdiff
|
tree
2009-12-08
Jef
f
K
i
ng
add-interactive:
f
i
x
del
e
tion o
f
n
o
n-
e
mpt
y
files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
J
unio
C Hamano
Git 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Linus Torvalds
Fix diff -B/--dirstat miscounting of newly
a
dded contents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jeff K
i
ng
reset:
improve
w
orktr
e
e sa
f
ety val
v
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zulli
n
ger
D
ocumentat
i
on: Av
o
id use of
xmlto --st
r
ingparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
René Scharfe
a
rchive: clarify descri
p
t
ion of path pa
r
am
e
ter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Je
f
f King
rere
r
e: don't segfault o
n
failur
e
to open rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
Haman
o
P
r
epare for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge branch 'uk/maint-shortlog-encodi
n
g' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
M
e
rge branch
'
fc/maint-format
-
pat
c
h-p
a
thspec-dash
e
s
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
H
ama
n
o
Merge branch 'a
p
/ma
i
nt-merge
-
strategy-lis
t
-fi
x
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge branc
h
'j
c
/maint-am-keep' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge branch 'rs/wo
r
k-around-grep-
o
pt-insanity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C
Hamano
M
e
r
g
e
b
ranc
h
'rj/maint-cygwin-count-objects' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
branch 'mm/maint
-
hint-failed-m
e
r
g
e' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
r
anch
'
th/maint-remote-
u
pda
t
e-help
-
str
i
ng' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch '
r
j
/maint-t9700' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
amano
Merg
e
bra
n
ch 'l
s
/
ma
i
nt-mailinfo-no-i
n
body' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bran
c
h
'mo/main
t
-
crlf
-
doc'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C H
a
ma
n
o
M
e
r
ge b
r
anch 'th/remote-us
a
g
e' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C
Hamano
Merge b
r
a
n
c
h
'
p
b/m
a
int-use-custom-perl' i
n
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Merge branch 'mm/config-pathname-ti
l
d
e-expand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge bra
n
ch 'bc/
g
rep-i-F' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merge branch
'jk/maint
-
break-ren
a
m
e-reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merg
e
branch 'rj/mai
n
t-simplify-cy
g
win-makefi
l
e
' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge branch 'rg/doc-work
f
low' into
m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge branch 'np
/
m
aint-sideband-favor-st
a
t
u
s' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Docu
m
e
n
t
ation: xml
t
o 0
.
0
.
18 does not kno
w
-
-
str
i
ngparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Bran
d
on Casey
t4201: u
s
e ISO8859-1 rather than ISO-8859-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jan Krüger
p
u
l
l: clarify a
d
vice for
the unconfigur
e
d
error case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C Hama
n
o
Uncondi
t
i
onall
y
set
m
a
n
.
base
.
u
r
l
.
f
o
r
.
r
e
lative
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Document
a
t
i
o
n/Makefile:
a
l
l
ow man
.
base
.
u
rl
.
for
.
relative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io C Hama
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 Hamano
merge: d
o
not
a
dd standa
r
d message when message is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Jun
i
o
C H
a
mano
Do
not misidentify "git mer
g
e f
o
o HEA
D
" as an
old-
s
tyle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguila
r
help: Do
not unneces
s
arily loo
k
for a repository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Michael J Gruber
Docu
m
entation: Fix a few i
.
e
.
/e
.
g
.
m
ix-ups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
D
av
i
d Soria Parra
Documentation: Docume
n
t --br
a
nc
h
optio
n
in gi
t
c
l
one
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
M
a
tth
i
eu
Moy
b
u
il
t
in-merg
e
: show user-friendly error messages for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
M
a
t
t
hieu Moy
merg
e
-recursive:
make th
e
e
r
ror-message ge
n
eration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
A
v
ery Pen
n
arun
b
u
iltin-merg
e
.
c: call e
x
clude_cmds() correctly
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
J
unio C Ham
a
no
R
emove d
e
ad code f
r
om "git am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
F
e
l
i
p
e Contreras
for
m
at-patch: add te
s
t
fo
r
pars
i
ng of "
-
-"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Felipe Contreras
fo
r
mat-patch: fix
p
arsing of "--"
o
n the command line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C
H
a
ma
n
o
builtin-app
l
y
.
c:
p
a
y
att
e
n
ti
o
n to -p
<
n> when
d
e
termi
n
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Uwe Kl
e
ine-König
shortl
o
g
: respect com
m
it encoding
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Nicolas Pitre
pack-objects: spl
i
t
imp
l
i
c
ations of --all-pro
g
ress
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Step
h
en Boyd
instaweb: restart server if alre
a
dy
r
unning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Jeff King
pr
u
n
e-packed: only
show progress
w
hen
st
d
err is a tty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Juni
o
C
Hama
n
o
Protect
s
cripted Porcelain
s
from GREP_OPTION
S
insanity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
René Scharfe
merge
t
o
o
l
--lib: simplify gues
s
_merge_tool()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Ma
t
thieu Moy
user-ma
n
ua
l
: Doc
u
m
e
n
t that "git merge" doesn't like
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu Moy
merge-r
e
cur
s
ive: point the
user to comm
i
t wh
e
n file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Ju
n
i
o
C Hamano
Documentation
:
av
o
id xmlto
i
n
put e
r
ro
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
R
a
man G
u
p
t
a
Add
b
ranch m
a
n
agement fo
r
re
l
eases to gitworkflows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Lu
k
a
s
Sandström
git a
m
/mail
i
nfo: Do
n
't look at in-body headers
w
h
e
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Tim Henigan
g
i
t remote: Separate
u
sa
g
e
strin
g
s for
s
ub
c
om
m
a
nds
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Junio C
H
amano
diffcor
e
-
rename:
r
educe memory foot
p
rint by freeing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Ramsay Jon
e
s
git-count-objects
:
Fix a di
s
k-
s
pace u
n
der-estimate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Greg Price
D
ocument
a
tion: u
n
docum
e
nt gc'd
functi
o
n graph_releas
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Ramsay Jones
t9700-per
l
-git
.
sh:
F
ix a test failure o
n
C
ygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-19
Matthieu Moy
e
x
pand_us
e
r_path: e
x
p
a
nd ~ to
$
HOME,
no
t
to
t
he actual
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-18
Matthieu Moy
Expand ~ a
n
d ~user in c
o
re
.
excludesfile, commi
t
.
template
amended by
Junio C Hamano
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
Philippe B
r
uhat
.
.
.
M
a
ke sure $PERL_PATH i
s
def
i
ned when the
t
est suite
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
M
atthew
O
gilvie
core
.
autocrlf documen
t
ation: mention t
h
e crlf at
t
ribu
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
Brian
C
o
l
l
i
ns
grep: All
o
w case
insens
i
t
ive
s
e
arch of
f
ixed-strings
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
Jeff King
diffcore-b
r
e
a
k:
save cnt_
d
a
t
a for othe
r
p
hases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next