repo.or.cz
/
git
/
jrn.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
Juni
o
C Ham
a
n
o
Merge br
a
nch 'mm/ma
i
n
t
-merge
-
ff-erro
r
-mes
s
age-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
M
er
g
e branch
'jn/
m
ain
t
-pull-rebase-error-m
e
ssage' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branch '
j
k/maint-add-p-
d
elete-fi
x
'
into maint
commit
|
commitdiff
|
tree
2009-12-08
Je
f
f
King
add-interactive: fix deleti
o
n of non-empty files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Ha
m
an
o
Git 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Lin
u
s
T
orv
a
lds
Fix
diff
-
B/--dirsta
t
m
i
scounting of newly added co
n
ten
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
re
s
et
:
improve wo
r
ktree saf
e
t
y
val
v
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zullinger
Documentation: Avoi
d
use of xmlto --stri
n
gparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
René Scharfe
a
r
chive
:
clarify
description of pat
h
parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
rerere: don
'
t segfault on failure
to o
p
en rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Pr
e
pare
for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C Hamano
Merge bra
n
c
h
'uk/main
t
-sh
o
rtlog-encoding' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merg
e
br
a
nch 'fc
/
m
aint-format-patch-path
s
pec
-
das
h
es
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Ha
m
a
n
o
Merge bra
n
ch 'ap/maint-me
r
g
e
-
s
t
r
ategy-list-f
i
x' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
amano
M
erge bran
c
h 'jc
/
maint-
a
m-
k
eep'
into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Mer
g
e
b
r
anch 'r
s
/
work-aro
u
nd-gre
p
-
op
t
-i
n
sanity'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge branch
'
rj/maint-cygwin-count-objects' into main
t
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C
H
ama
n
o
Merge branch
'
mm/main
t
-hi
n
t-faile
d
-me
r
ge' int
o
m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Me
r
ge branch
'
th/maint-remo
t
e-upda
t
e-help
-
s
t
ring'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e branch
'
r
j
/mai
n
t-t970
0
'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o C Hamano
Merge branch 'ls/ma
i
nt-mailinfo-n
o
-inbody' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C
H
amano
M
erge branch 'mo/main
t
-cr
l
f-doc' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e
branch
't
h
/remote-usage
'
into
m
a
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Merge
b
ranch 'pb/mai
n
t-use-c
u
stom-perl'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge
b
r
anc
h
'mm/config-
p
a
t
hname-til
d
e-expand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'bc/grep-i-F' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'jk/maint-break-rename-reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Me
r
ge branch 'rj/maint-simplify-cygwin-makef
i
le
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Ha
m
ano
Merge branch 'rg/doc-workfl
o
w' i
n
to
m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge
b
ranch 'np/maint-sideband-favor-status' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C H
a
mano
D
oc
u
mentation: xmlto 0
.
0
.
18 does not know -
-
stringp
a
ram
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brand
o
n
C
a
sey
t4201: us
e
I
SO8
8
5
9-1
rathe
r
th
a
n ISO
-
8859-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jan Krüger
p
ull: c
l
ari
f
y advi
c
e
f
or the unconf
i
gured e
r
ror case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
G
it
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Unco
n
di
t
ionally set man
.
base
.
url
.
fo
r
.
relative
.
link
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
m
a
no
Docume
n
tatio
n
/Makefile: allo
w
man
.
base
.
url
.
f
o
r
.
rela
t
ive
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio 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 H
a
mano
merg
e
: do
not add standard me
s
s
age when message is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C Hamano
Do n
o
t
misidentify "
g
it merge foo HEAD"
a
s an
o
ld-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
David Agui
l
ar
he
l
p: Do not
u
nnecessaril
y
look for a re
p
ository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Michael J Gruber
Documenta
t
ion
:
Fix a
f
ew i
.
e
.
/e
.
g
.
mix-u
p
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
David Soria Par
r
a
Do
c
umentation: Document --
b
ranch op
t
ion i
n
git c
l
one
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Ma
t
thieu Mo
y
b
uilt
i
n-merge:
s
how us
e
r
-
f
riendly err
o
r messag
e
s for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu Moy
m
e
rge-recursive:
m
a
k
e th
e
err
o
r
-
message gene
r
ation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Avery Pennarun
builtin-merge
.
c: call exclude_
c
mds() correctly
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
J
unio C Ham
a
no
Remove dea
d
c
o
de from
"git am
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Felipe
Co
n
trera
s
forma
t
-patch: add test for
parsing of "--"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Felipe Contreras
fo
r
mat-
p
atch: fix parsing o
f
"--"
on the comman
d
line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
builtin-
a
pply
.
c: pay at
t
ention to -p<
n
> when determining
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Uwe Kleine
-
König
shortlog: resp
e
ct
c
ommit
e
n
coding
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Nicolas Pitre
pack-ob
j
ects: split
implication
s
of --
a
ll-pr
o
gr
e
ss
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Stephen Boyd
instaweb: res
t
art s
e
rver if already ru
n
n
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Jeff King
prune-packed
:
o
n
ly show progress w
h
en stderr is a tty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
J
u
nio C
H
a
mano
Protect scripted P
o
r
celain
s
f
ro
m
GR
E
P_OPTIONS ins
a
nity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Ren
é
S
c
harfe
m
erget
o
o
l
--lib: simplify guess_
m
erge_to
o
l()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Matt
h
ieu Moy
user-manual: Docu
m
ent that "git mer
g
e" doesn't l
i
k
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Ma
t
th
i
eu Moy
merge-recursive: po
i
nt
the u
s
e
r to commi
t
when file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Juni
o
C Haman
o
Documentation: avoid xmlto input
error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Raman G
u
pta
Add
b
ranch managem
e
nt for r
e
l
e
a
ses to gitworkflow
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Lukas Sa
n
dström
git am/mailinfo: Don't look at i
n
-b
o
dy headers when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Ti
m
H
enigan
git
r
emote: S
e
parate u
s
a
g
e st
r
ings for subcomman
d
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Junio
C
Hamano
diffcore-re
n
am
e
: redu
c
e memory
f
o
otprint by freeing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Ramsay Jones
git-count-ob
j
ect
s
:
Fi
x
a disk-space under-esti
m
ate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Greg Pr
i
ce
Doc
u
me
n
tation: undo
c
ument gc'd
f
u
nc
t
i
o
n grap
h
_
release()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Ramsay Jo
n
es
t9700-perl-git
.
sh: F
i
x
a
test fa
i
lure o
n
Cygw
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-19
M
a
t
t
hieu Moy
exp
a
nd_user_path: expand ~ t
o
$H
O
ME, not to t
h
e actual
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-18
Mat
t
h
ie
u
Moy
Expand ~ a
n
d ~u
s
er in core
.
excludes
f
ile, commit
.
template
amended by
Junio C Hamano
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
P
hilippe B
r
uhat
.
.
.
Ma
k
e
sur
e
$PER
L
_PATH is
d
e
f
i
ned when t
h
e test suite
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
Matthew Ogil
v
ie
core
.
autocrlf d
o
cum
e
ntation:
ment
i
on the crlf attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
Brian Collins
grep
:
Allow case i
n
sensitive search of fixed-strings
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
Jeff King
diffcore-break: save cnt_data for other
phases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
J
eff King
diffcore-break: free
filespec data a
s
we
g
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
J
u
nio C H
a
m
a
no
Git
1
.
6
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Me
r
ge branch 'bs/maint-pr
e
-commi
t
-hook-s
a
mp
l
e' into
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Juni
o
C Hama
n
o
Merge
branch 'jk/maint-add-p
-
empty' into
maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Haman
o
M
e
rge
branch 'js/
m
aint-diff-colo
r
-words' int
o
maint
commit
|
commitdiff
|
tree
2009-11-16
Junio
C
Hama
n
o
Merge bran
c
h
't
z
/maint-rpm
'
into
m
aint
commit
|
commitdiff
|
tree
2009-11-16
Juni
o
C
H
amano
M
e
rge branch 'jk/maint-format-patch-p-suppres
s
-
stat
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Junio C Ham
a
no
Merge branc
h
'pb/
m
ai
n
t-gitw
e
b-blob-lineno' into mai
n
t
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Me
r
ge branch 'jk/maint-1
.
6
.
3
-
ls-files-i' into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C
Hamano
Merge
b
ranch 'vl/maint-ope
n
s
sl-signature-change' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Junio C
H
ama
n
o
Merge
b
r
an
c
h 'jk/
m
ain
t
-push-config' int
o
m
aint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Ham
a
no
M
e
rge branch 'sr/bl
a
m
e-
i
nc
o
mplet
e
' into
maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C
H
amano
Mer
g
e
branch
'
j
c
/
maint-bla
n
k-at-eof' into maint
commit
|
commitdiff
|
tree
2009-11-16
Juni
o
C
Hamano
M
e
rge
branch 'jc
/
main
t
-1
.
6
.
3-gr
a
ft-trail
i
ng
-
space'
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hama
n
o
Merge branch 'tr/
m
a
i
nt-roff-quote' into
main
t
commit
|
commitdiff
|
tree
2009-11-16
Junio C Ha
m
ano
Merge branch
'ja/fetch-doc' i
n
to maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
M
e
rge branch 'cb/doc-fetch-pu
l
l-merge
'
i
nto maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hama
n
o
Merge
branch 'jk/maint-cvsim
p
ort-p
a
t
hname' into maint
commit
|
commitdiff
|
tree
2009-11-16
J
unio
C
Hamano
Merge branch 'jc/receive
-
pack-auto'
into
ma
i
nt
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Me
r
ge b
r
anch
'gb/
m
aint-gitw
e
b-esc-
p
ara
m
'
i
n
t
o maint
commit
|
commitdiff
|
tree
2009-11-16
J
u
n
i
o
C
H
a
mano
M
e
rge branch 'jn/gitweb-patch' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2009-11-15
Tim
H
enig
a
n
U
pdate 'git remo
t
e
up
d
ate' usage
string to
ma
t
ch man
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-14
Todd Z
u
ll
i
nger
Make
f
ile:
Ensure
r
p
m
pac
k
ages ca
n
be read by older
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-14
S
t
ephen Boyd
git-add
.
txt: fix
f
ormatting of --patch section
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-13
Nicolas
Pitre
give p
r
iority to progre
s
s
messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-11
Junio
C Haman
o
check-re
f
-format -h: it does not k
n
ow the --print o
p
tion y
e
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nathan
Nieder
merge: do not
setup
w
orktree tw
i
ce
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
ch
e
ck-ref-form
a
t: updat
e
u
sag
e
str
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-09
R
a
m
say Jone
s
Makefile:
merge two Cyg
w
in
configuration sections into one
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next