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
J
u
n
i
o
C Hama
n
o
Merge
b
r
anch 'mm/
m
aint-m
e
r
g
e
-
ff-error-m
e
ss
a
ge-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
M
er
g
e
branch 'jn/maint-pull-rebase-error
-
message' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hama
n
o
Merge branch 'jk/maint-add
-
p-delete
-
fix' into maint
commit
|
commitdiff
|
tree
2009-12-08
Jeff King
add-interactive:
fix deletion of non-empty f
i
les
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio C
H
amano
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
/
--dirst
a
t
miscou
n
ting
of newly ad
d
ed conte
n
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
reset: improve wor
k
tr
e
e safety valves
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Todd
Zullinger
Doc
u
mentation: Avoid use of
xmlto
-
-str
i
ngparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
R
ené S
c
harfe
arch
i
ve: clarify description of path parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
Jef
f
King
rerer
e
: don't segfaul
t
on failure t
o
o
p
en rr
-
cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Pr
e
p
a
re for
1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
ranch 'uk/maint-shortlog-
e
nc
o
ding' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge b
r
anch
'f
c
/m
a
i
n
t
-
format-patch-pathsp
e
c-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Ha
m
a
no
Merge bra
n
ch
'ap/maint-merg
e
-s
t
rateg
y
-list-fix'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
a
m
a
no
Me
r
ge
branch
'
jc
/
m
aint-am-keep'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge bra
n
ch
'
rs/work
-
arou
n
d-g
r
ep-opt-insani
t
y' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Mer
g
e
branch
'
rj/m
a
int-cygwin-count-objects' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e
branch 'm
m
/maint-hint-fa
i
l
e
d
-merge' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C
Hama
n
o
Merge bran
c
h 'th
/
main
t
-remote-upd
a
te-help-s
t
rin
g
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge branch 'rj/maint-t9700' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C
Hama
n
o
Merge branch 'ls
/
maint-mailinfo-no-inbody' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
M
e
rg
e
branc
h
'mo/maint-c
r
lf-doc' i
n
to main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge branch
'th/remote-usage' in
t
o
m
ain
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'
p
b/
m
ain
t
-us
e
-c
u
sto
m
-perl' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Ham
a
no
Mer
g
e
b
r
a
nch 'mm/
c
onfig-
p
athname-tilde-expand' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io
C H
a
mano
Merge branch 'b
c
/grep-i-F
'
into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
Hamano
Me
r
ge
branch 'jk/maint-
b
reak
-
rename-redu
c
e-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
ama
n
o
Merge branch '
r
j/m
a
int-simplify-cygw
i
n-makefile' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Ha
m
a
n
o
M
e
rge branch '
r
g/doc-workflow' into
m
a
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
M
erge branch 'np/mai
n
t-si
d
eband-fa
v
o
r
-
s
tatu
s
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Documentat
i
o
n
:
x
mlto 0
.
0
.
18 doe
s
not know -
-
stringpar
a
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
B
r
andon Casey
t4201: use IS
O
8859-1 rather th
a
n ISO-8859-
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jan Krüger
pull: clarify ad
v
ice for th
e
u
nconfigured error case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C Hamano
Git 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Hamano
Unconditi
o
nally set man
.
b
a
se
.
u
r
l
.
f
o
r
.
r
elative
.
l
inks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
unio C Hamano
P
r
ep
a
re for 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hama
n
o
m
e
rge: do not add stand
a
rd messa
g
e w
h
en message
is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Do
not mi
s
identify "g
i
t merge fo
o
HEAD" as
an old-styl
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help: Do not unnecess
a
rily look for a repository
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Michael J Gruber
Documentati
o
n: Fix a fe
w
i
.
e
.
/e
.
g
.
mix-u
p
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
David
Sori
a
Parra
Documentation: Docum
e
nt -
-
branch opt
i
on
i
n
g
it clone
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Matt
h
ieu
M
oy
bu
i
ltin-
m
erge: show us
e
r-fr
i
endly error m
e
ssages for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Matthie
u
Moy
me
r
g
e-recursive:
m
ake the error-messag
e
generati
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
A
very Pennarun
builtin
-
merge
.
c: ca
l
l e
x
clude_c
m
ds()
c
o
rrectly
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Ju
n
io C Ha
m
ano
R
emove dead code
f
rom
"git am"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
F
e
l
ipe Contr
e
ras
format-patch
:
add
t
est
for parsing of "--"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Feli
p
e
Co
n
treras
form
a
t-patch: fix parsing of
"--
"
on the
comma
n
d
l
ine
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Ju
n
io
C Hamano
buil
t
in-
a
p
p
l
y
.
c: pa
y
atte
n
t
i
on
t
o
-
p<n
>
when deter
m
ining
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Uwe Kleine-König
shortlo
g
: respect
commit enc
o
ding
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Nicolas Pitre
pack-objects: split implications of
--
a
ll-progr
e
ss
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Stephen Boyd
instaweb: re
s
tart
server if
a
lready running
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Jeff King
p
rune-packed: only
show
p
rogress w
h
en st
d
err is a t
t
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Ju
n
io
C
Hamano
Protect scripted Porcelains from GR
E
P
_OPTI
O
NS i
n
sa
n
ity
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
René
S
charfe
mergetool--lib: s
i
mpl
i
f
y
guess_merge_tool()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu Mo
y
user-manual:
Documen
t
that "git
m
er
g
e" doesn
'
t like
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu Moy
merge-recur
s
ive
:
point the user t
o
commit when file
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Jun
i
o C
H
a
m
ano
D
o
cumentation: avoid xmlt
o
input
error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
R
aman Gupta
Add
b
ranch management for rel
e
ases to
g
i
tworkflows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Lukas Sandstr
ö
m
g
i
t am/mailin
f
o: Don't look at in-body heade
r
s
when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Tim Henigan
g
i
t remo
t
e: Sepa
r
ate u
s
ag
e
strings for subcommands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
diffcore-rename:
reduce
memory footprint by
f
r
e
eing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Ramsay Jones
g
i
t-count-object
s
:
Fix a disk-s
p
ace
u
nder-estimat
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Gr
e
g Price
Do
c
umentation
:
und
o
c
u
ment gc'd fu
n
ction gr
a
ph
_
release()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Ramsay Jone
s
t9700-
p
er
l
-git
.
sh:
Fi
x
a test failure on Cygwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-19
Matthieu Moy
e
x
pa
n
d
_
use
r
_path: expand ~ t
o
$
H
O
ME, not t
o
the actual
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-18
M
atthieu
M
oy
Expand ~ a
n
d
~
user in core
.
excludesfile, com
m
it
.
template
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-17
Philippe Bruhat
.
.
.
Mak
e
sure $PERL_PATH is de
f
ined w
h
en
t
he test suite
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-17
Matthew Ogil
v
ie
core
.
auto
c
rl
f
d
ocumentation: mentio
n
the crlf a
t
tribut
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-17
Brian Collins
g
rep: Allow case i
n
sensitive searc
h
of fixed-strings
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-16
J
e
ff King
diffcore-break: save cnt_da
t
a
f
o
r
other
p
h
a
se
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-16
Jef
f
Ki
n
g
di
f
fcore-bre
a
k
:
f
ree filespec data as we go
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Git 1
.
6
.
5
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-16
Junio C H
a
m
a
no
M
e
rg
e
b
r
anch 'bs/maint-pre-commit-hook-sam
p
le'
into
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
J
u
n
io C Haman
o
Merge branc
h
'jk/m
a
int-add-
p
-empty
'
into ma
i
n
t
commit
|
commitdiff
|
tree
2009-11-16
Junio C Ha
m
ano
Merg
e
branch 'js/maint-diff-color-words'
i
nto maint
commit
|
commitdiff
|
tree
2009-11-16
J
unio C Hama
n
o
M
e
rge bra
n
c
h
't
z
/
maint-rpm' into m
a
int
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Mer
g
e branch 'jk/maint-format-p
a
t
c
h-p
-
suppress
-
stat
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
J
unio C Ham
a
no
Me
r
ge branch 'pb/ma
i
nt-g
i
tweb-blob-lineno' into
m
aint
commit
|
commitdiff
|
tree
2009-11-16
J
u
ni
o
C
H
amano
Merge branch 'jk
/
maint-1
.
6
.
3-l
s
-files-i'
into m
a
int
commit
|
commitdiff
|
tree
2009-11-16
Junio
C
Hamano
Me
r
ge branch 'vl/
m
ain
t
-openssl
-
signature-
c
h
a
n
g
e
' into
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Me
r
ge branch 'jk
/
main
t
-push-config' into main
t
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hama
n
o
Mer
g
e bra
n
ch
'
s
r/blame-incomp
l
ete' i
n
to
maint
commit
|
commitdiff
|
tree
2009-11-16
Juni
o
C Hama
n
o
Merge branch 'jc/maint-blank
-
at-eof' into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge bra
n
ch 'j
c
/m
a
i
n
t-1
.
6
.
3-graft-t
r
ailing-spa
c
e
'
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Junio C
H
amano
M
erge br
a
nch
'
tr/m
a
int-roff-quot
e
'
into
m
a
int
commit
|
commitdiff
|
tree
2009-11-16
Junio
C Hamano
Merge br
a
nch 'ja/
f
etc
h
-
d
o
c' into mai
n
t
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge branch '
c
b/doc-fetch-
p
ull-me
r
ge
'
into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C
Hamano
Merge bra
n
ch '
j
k/maint-cv
s
i
m
p
o
rt-pathn
a
me' into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Ha
m
ano
Merge branch
'jc/recei
v
e-pack-auto' into maint
commit
|
commitdiff
|
tree
2009-11-16
Ju
n
io C
H
aman
o
Merge
branch 'gb/maint-gitweb-esc-
p
ara
m
' in
t
o maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Ha
m
ano
Me
r
ge branch 'jn/gitw
e
b-patch' in
t
o maint
commit
|
commitdiff
|
tree
2009-11-15
Ti
m
He
n
i
g
an
Update
'g
i
t remot
e
updat
e
' usage string to
m
atch man
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-14
Todd
Zu
l
lin
g
er
M
akefile: Ensure rpm pa
c
kag
e
s can be r
e
ad by
o
lder
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-14
St
e
phen B
o
yd
gi
t
-ad
d
.
txt: fix for
m
a
tt
i
ng of --patch se
c
ti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-13
Nicol
a
s Pitre
give priority to progress
m
essages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-11
Junio
C
Hamano
check-ref-format -h: it does not know the
--print option yet
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
onathan N
i
ede
r
merg
e
:
do no
t
s
etup workt
r
e
e
t
w
i
c
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Niede
r
c
h
eck-re
f
-format: update usage str
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-09
Ra
m
s
a
y Jones
Makefile:
m
erge two Cygwi
n
configuration sec
t
io
n
s
i
nto
o
ne
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-09
Jon
a
than Nieder
A
d
d interme
d
iate
build
p
r
oducts to
.
giti
g
nore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next