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 'mm/maint-merge-ff-error-message-fix' into maint
2009-12-09
Junio C Hamano
Merge
b
ranch 'mm/maint-merge-ff-error-message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
u
n
i
o
C Hamano
Merge
b
ran
c
h
'jn/main
t
-pull-rebase-er
r
or-mess
a
g
e
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
a
man
o
Merge branch 'jk/maint-add-
p
-
delet
e
-fix' int
o
mai
n
t
commit
|
commitdiff
|
tree
2009-12-08
Jeff King
add-int
e
ractive:
fix deletion
o
f non-empty files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Git 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Linus T
o
r
v
alds
Fix diff -B/--
d
irstat m
i
sco
u
n
t
i
n
g
of
newly add
e
d content
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
J
eff K
i
ng
re
s
et
:
improve wor
k
tree safety
valves
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zull
i
nge
r
Do
c
u
m
enta
t
io
n
: Avoid
u
s
e
of xm
l
to --
s
tri
n
gparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
Ren
é
Scharfe
archive:
c
larify des
c
r
i
p
tion of
path para
m
ete
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
rerere: d
o
n't segfa
u
lt
o
n
failure to open rr-cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C
H
a
m
ano
Prepare for
1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge branch 'uk/m
a
i
nt
-
shortl
o
g-enco
d
ing' into
m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge b
r
anch 'fc/
m
a
int-format-
p
atch-pathspec-
d
ash
e
s
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C
H
a
mano
Merge bran
c
h 'ap/maint-
m
er
g
e
-
str
a
teg
y
-list-
f
ix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'jc/main
t
-am-k
e
ep' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Ha
m
ano
M
e
rge
b
ranch '
r
s/wo
r
k-ar
o
und-g
r
ep-op
t
-i
n
sanity'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Ham
a
no
Merge branc
h
'rj/
m
aint
-
cygwin-count
-
objects' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e b
r
anch 'mm/maint
-
hint-failed-merge
'
into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
branch 't
h
/main
t
-remo
t
e-
u
pdate-
h
elp-st
r
ing' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merg
e
branc
h
'rj/maint-t970
0
' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
H
amano
Merge branch 'ls/mai
n
t-mailinfo-no
-
inbody' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Haman
o
Merge branch 'mo/maint-
c
r
l
f-doc' into ma
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
M
e
r
ge branch
'
th/re
m
o
t
e
-
usage' in
t
o
mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
ranch
'p
b
/maint-
u
se
-
cust
o
m-
p
erl' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C Hamano
Me
r
ge branch 'm
m
/config-pathn
a
me-
t
ilde-expa
n
d' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge
b
ranch 'bc
/
grep-i-F
'
in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
H
a
m
ano
Merge
branc
h
'jk/maint-break-rename-reduc
e
-me
m
ory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
M
e
r
ge branch 'rj/main
t
-
s
impl
i
fy-cy
g
wi
n
-
m
akefile
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C Hamano
Merge branch 'rg/doc-workflow' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
M
e
r
g
e branch 'np/main
t
-sideba
n
d-favor-status' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Haman
o
Do
c
um
e
nta
t
ion: xmlto 0
.
0
.
18 does not know --
s
tringpar
a
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Bra
n
do
n
Ca
s
ey
t
4201: use
I
SO885
9
-1 r
a
t
h
e
r than ISO-885
9
-1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
a
n Krüge
r
pull:
clar
i
fy ad
v
i
c
e
fo
r
the u
n
configured error cas
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
a
m
ano
G
i
t 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
U
n
conditio
n
ally set man
.
base
.
url
.
fo
r
.
r
e
la
t
ive
.
links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C
Haman
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
ano
mer
g
e: do not add stand
a
rd message when message is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Do not misidentify "git
merg
e
f
oo
H
EAD" as an old-st
y
le
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
David
A
guilar
h
e
lp: D
o
not unnecessarily look for a reposito
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Michael J Gruber
Doc
u
mentation: Fix a fe
w
i
.
e
.
/e
.
g
.
mix-ups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
David Soria Parra
Documen
t
ation: Docu
m
ent --branc
h
opti
o
n in git
clone
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Ma
t
thieu Moy
b
uiltin-mer
g
e
:
show user-friendly erro
r
messages for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Matthie
u
Moy
merg
e
-recur
s
iv
e
: make the error
-
mes
s
age gene
r
ation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
A
ve
r
y
P
e
nnarun
b
uil
t
in-merge
.
c: call exc
l
ude_cmds() correctly
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
Remove dea
d
co
d
e
f
rom "git am"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Fel
i
pe
C
ontreras
form
a
t-patch
:
add test fo
r
p
a
r
s
ing of "--"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Felipe Contreras
format-patch: fix parsing o
f
"--" on
the command line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
J
u
nio C Haman
o
builtin-appl
y
.
c: p
a
y a
t
tention
t
o -p<n> when determining
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Uwe Kleine-König
sh
o
rtlog
:
r
espect commit
e
ncodi
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
N
i
colas Pitre
pack
-
objec
t
s: sp
l
it impli
c
ati
o
ns of --al
l
-progr
e
ss
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
St
e
phen Boyd
i
nstaweb: restart server if already r
u
nning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Jeff King
prune-p
a
cked: only show pr
o
gress
when stde
r
r is a tty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
P
rotect
scripted Porce
l
a
ins from GR
E
P
_
O
P
T
IONS insanity
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
R
e
né Sc
h
arfe
m
e
rgetool--lib:
s
implify
guess
_
merge_too
l
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Ma
t
thieu Moy
user-manual
:
Document
t
ha
t
"gi
t
merg
e
"
doesn't like
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
M
att
h
ieu Mo
y
m
e
rge-recursive: point the user to comm
i
t when file
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
Docume
n
tati
o
n: avoid xml
t
o i
n
put error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Raman Gupta
Add branch managem
e
nt
for releases
to gitwo
r
k
flows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
L
u
kas San
d
s
t
röm
git
am/
m
ailinf
o
: Don't look
a
t in-
b
o
d
y header
s
when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
T
i
m Hen
i
ga
n
gi
t
remo
t
e
:
S
eparate
u
sage
st
r
ings for subcommands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Ju
n
io
C Hamano
d
iffc
o
re-rename: r
e
duc
e
m
e
mo
r
y
footprint by freeing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Ramsay
J
on
e
s
git
-
coun
t
-objects: Fix a disk-space und
e
r-estimate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Greg Price
Documentatio
n
:
u
n
d
o
cument gc'
d
f
u
n
ction
g
raph_rel
e
a
s
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Ramsay
J
ones
t9700-perl-git
.
sh
:
Fix a test failure on C
y
gwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-19
Matthieu Moy
expand_user_path:
e
xpa
n
d ~
t
o
$H
O
ME,
not to the ac
t
ual
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-18
Ma
t
thi
e
u Moy
Exp
a
n
d
~ and ~user in core
.
exclu
d
e
sfile, commi
t
.
templat
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-17
Philippe Bruhat
.
.
.
Make
s
ure $PERL_PATH is
def
i
ned whe
n
the tes
t
s
u
ite
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-17
Matt
h
ew O
g
i
lvi
e
core
.
a
u
tocrlf
d
oc
u
mentation: mention the crlf attr
i
bute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-17
Brian Colli
n
s
g
rep
:
A
llo
w
case insensitive search of
fixed-
s
trin
g
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-16
J
e
ff King
d
i
f
f
c
ore-break: s
a
ve cnt_data for other phases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-16
Jeff King
diffcore-brea
k
: free files
p
ec data as we go
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-16
Jun
i
o
C Ha
m
ano
Git 1
.
6
.
5
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-16
Ju
n
i
o C Hamano
Merge branch 'b
s
/mai
n
t-p
r
e-commit-hook-sample' into
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Junio
C
H
amano
Merg
e
branch 'jk/maint-add-p
-
e
mpty' into main
t
commit
|
commitdiff
|
tree
2009-11-16
Ju
n
io C Ham
a
no
Me
r
ge branch 'js/maint-diff-co
l
or
-
words' into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio
C Ha
m
ano
Merge branc
h
'tz/maint-rpm' i
n
to maint
commit
|
commitdiff
|
tree
2009-11-16
Junio
C Hama
n
o
Merge branch 'jk/
m
a
i
nt-format
-
p
atch-p-suppress-stat
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hama
n
o
Merge branch '
p
b
/mai
n
t-gitweb
-
b
l
o
b-lineno
'
into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Ha
m
ano
Merg
e
br
a
nch 'j
k
/maint-1
.
6
.
3-ls-files-i' into maint
commit
|
commitdiff
|
tree
2009-11-16
J
u
nio C
Hamano
Merge branch 'v
l
/m
a
int-opens
s
l-signat
u
re-ch
a
nge'
into
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
M
erg
e
branch 'j
k
/main
t
-push-config
'
i
n
to
maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge branch 'sr/blame-incomplete
'
into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge b
r
anch 'jc/maint-blank-
a
t-eof' into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
M
e
rge branch 'jc/ma
i
nt-1
.
6
.
3
-
g
r
aft-trailing-space'
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Juni
o
C Hamano
M
erge bra
n
ch
'tr/maint-roff-
q
uote' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2009-11-16
Jun
i
o C Haman
o
Mer
g
e branch
'
ja/fetch-doc'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge
b
ranch 'cb/doc-fetch-pu
l
l-mer
g
e' into
m
a
i
nt
commit
|
commitdiff
|
tree
2009-11-16
Ju
n
io
C
Hamano
Me
r
ge branch
'jk/maint-cvsimpor
t
-p
a
thname' into ma
i
n
t
commit
|
commitdiff
|
tree
2009-11-16
Junio C H
a
man
o
M
e
rg
e
b
ran
c
h 'jc/receive-pa
c
k
-auto' into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
M
e
rge branch 'gb/ma
i
nt-gi
t
web-
e
sc-param' into m
a
i
nt
commit
|
commitdiff
|
tree
2009-11-16
Junio
C Ha
m
a
no
Merge
b
ranch 'jn/
g
itweb-patch' int
o
m
aint
commit
|
commitdiff
|
tree
2009-11-15
T
im
Henigan
U
pdate 'git remote update'
usage string to match man
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-14
T
o
dd Zulli
n
g
er
Make
f
ile:
E
nsur
e
r
pm p
a
c
kages can be read by older
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-14
Stephen Bo
y
d
git-add
.
t
xt: fix formattin
g
of --p
a
tch section
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-13
Nic
o
las Pitr
e
give priority to progress messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-11
J
unio
C
Hamano
c
h
eck-ref-fo
r
m
at -h: it does not know the --
p
r
int o
p
tion
y
et
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
merge: do n
o
t
setup
w
orktre
e
twi
c
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jona
t
han Niede
r
c
heck-
r
e
f-
f
ormat: update usage string
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-09
Ram
s
a
y
J
ones
Makefile: me
r
g
e
two
C
y
g
win co
n
figuration sect
i
ons
i
nto one
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-09
Jona
t
han Nieder
Add
i
ntermediate buil
d
p
r
o
ducts to
.
git
i
gno
r
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next