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 'gf/maint-sh-setup-nongit-ok' into maint-1.6.6
2010-03-07
Junio C Hamano
Merge branch
'gf/maint-sh-setup-nongit-ok' i
n
to maint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ham
a
no
Merge b
r
anch 'jk/maint-rmdir-fix' in
t
o
m
aint-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Hama
n
o
Merge branch 'rs/optim-text-wrap' int
o
mai
n
t
-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Hamano
Merge branch '
t
r
/
m
a
int-cherry-pick-list' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
ama
n
o
Merge
b
ranch 'cc/maint-
b
isect-paths' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Merge branc
h
'maint-1
.
6
.
5' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-02-16
J
u
n
io C Hamano
Merge branch 'maint-1
.
6
.
5' in
t
o m
a
int-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-02-12
Junio
C
Hamano
Fix
typo in 1
.
6
.
6
.
2 release not
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Junio C Hamano
Re-fix chec
k
-ref-format docu
m
en
t
ation mark-up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Git 1
.
6
.
6
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Junio C H
a
m
an
o
Mer
g
e bran
c
h 'maint-1
.
6
.
5' int
o
main
t
commit
|
commitdiff
|
tree
2010-02-10
Junio C
H
aman
o
t
8
003: check ex
i
t code o
f
c
o
mmand and error
m
essage
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Junio C Ha
m
a
n
o
Merge bran
c
h 's
p
/maint-fast-import-la
r
ge
-
blob' into
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Merge br
a
nch 'g
p
/maint
-
cvsserver' into maint
commit
|
commitdiff
|
tree
2010-02-10
Junio
C
Hamano
Merge b
r
anch 'jc/main
t
-reflo
g
-bad-timestamp' into mai
n
t
commit
|
commitdiff
|
tree
2010-02-10
J
u
nio C Hamano
Merge br
a
n
c
h 'il/main
t
-xmallocz' i
n
t
o maint
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Merge branch 'jh/ma
i
nt-confi
g
-file-pr
e
f
i
x' into maint
commit
|
commitdiff
|
tree
2010-02-10
Junio C
Hamano
M
er
g
e
b
ranch 'nd/include-termi
o
s-fo
r
-o
s
ol' into main
t
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
M
e
rge b
r
anch 'jc/maint-1
.
6
.
1-ch
e
ckout-m-custom-merge
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Junio C
Hamano
M
e
rge b
r
anch 'rs/m
a
int
-
archive-match-p
a
thspe
c
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Junio C
Hamano
check-ref-format docume
n
tation: fix enum
e
r
ation m
a
rk-up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-09
J
u
nio C Hamano
Merge
b
ranch 'maint
-
1
.
6
.
5' into
m
aint
commit
|
commitdiff
|
tree
2010-02-09
Junio C Ham
a
no
Merge
b
ra
n
ch 'jc/main
t
-push-doc-status' into maint
commit
|
commitdiff
|
tree
2010-02-09
Ju
n
i
o C
H
amano
git-push
:
docum
e
nt a
l
l the status f
l
ags used
i
n
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-08
Junio C Haman
o
Merge
br
a
nch 'jc/maint-
i
m
ap-config-
p
a
rse'
i
nto maint
commit
|
commitdiff
|
tree
2010-02-08
Junio C H
a
mano
Fix parsing of imap
.
pr
e
formattedHTML and i
m
ap
.
sslve
r
ify
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-08
Junio C Hamano
M
e
rge b
r
anch 'jc/
m
a
int-doc-git
-
add-example'
i
n
t
o ma
i
nt
commit
|
commitdiff
|
tree
2010-02-08
Junio C Hamano
git
-
add documentation:
F
i
x
sh
e
ll quoting
example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-05
Jun
i
o C Hama
n
o
Merge b
r
an
c
h
'jc/maint-li
m
it-note-output' into
m
aint
commit
|
commitdiff
|
tree
2010-02-01
Junio C H
a
mano
Merge branc
h
'sb/maint-octopus' into m
a
int-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-02-01
Jun
i
o C H
a
mano
Merge b
r
a
nch
'b
g
/maint-add-all-doc' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-30
Ju
n
io
C
Hamano
Merge b
r
anch 'maint-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-27
J
u
nio C Ha
m
a
n
o
t0101
:
use a fixed timestamp w
h
e
n
searching in the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-27
Junio C Hamano
Update
@{bo
g
us
.
timest
a
mp} fix not to die()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-26
Junio
C
Hamano
approxidate_careful() reports errorn
e
o
us dat
e
st
r
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-24
Jun
i
o C
Ham
a
n
o
Me
r
g
e
branch 'main
t
' o
f
git:/
/
git
.
s
p
earce
.
o
r
g/git-gu
i
.
.
.
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
ignore duplicat
e
d slas
h
es in make_relative_pa
t
h(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Ju
n
i
o
C
Hamano
merge
-
recursive: do no
t
return NULL
o
nly to c
a
use segfault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
F
i
x
"
log --oneline"
not to show notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Mer
g
e branch 'jc/maint-refresh-index-is-optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
Fix "
l
og" f
a
mily not
t
o be to
o
agr
e
ssiv
e
a
b
ou
t
showing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Git 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C H
a
mano
M
erge branch 'bg/ma
i
nt-
r
e
m
ote-update-defau
l
t
' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge br
a
nch 'sb/maint-
o
ctopus' into maint
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ha
m
a
no
Merge bra
n
ch
'
bg
/
main
t
-a
d
d-all-doc' into ma
i
nt
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge branch
'maint-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Me
r
ge
br
a
nch 'jk/maint-1
.
6
.
5-reset-hard' i
n
to mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ha
m
ano
Merg
e
branch 'tr/maint-1
.
6
.
5
-
bas
h
-prompt-show
-
s
u
bm
o
dule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge branch 'dp/maint
-
1
.
6
.
5-fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
n
c
h 'jm/mai
n
t-1
.
6
.
5-grep-N
U
L
-
termina
t
e' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Ha
m
ano
statu
s
: don't require
t
he repository to be writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Merge bra
n
ch 'maint-1
.
6
.
4
'
int
o
main
t
-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Ha
m
ano
M
e
rge branc
h
'maint-1
.
6
.
3' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C H
a
man
o
Merge bra
n
ch '
m
aint-1
.
6
.
2
'
i
nto maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
c
o
mmit 'v1
.
6
.
4
.
4-8-g8de6
5
18' into mai
n
t-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Fix
mis-backport of t70
0
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Update draft release no
t
es to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Merge branch 'dp/ma
i
nt-1
.
6
.
5
-
fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
b
ranch 'jm/mai
n
t-1
.
6
.
5-grep-NUL-
t
ermin
a
te' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-12
Junio
C
Hamano
grep:
-L sh
o
u
l
d
s
how empty
f
iles
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge br
a
nch 'maint-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2010-01-10
J
unio C Hamano
Merge
branc
h
'maint-1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Ju
n
io C Ham
a
n
o
Me
r
g
e bra
n
ch 'maint-1
.
6
.
0
'
into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
c
h
eckout -m:
do not tr
y
to
f
all
back to --merge from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-06
J
u
nio
C Hamano
checkout -m pa
t
h
: fix recreating co
n
flic
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-31
Junio C Hamano
M
e
rge branch 'm
a
int-1
.
6
.
0' into maint
commit
|
commitdiff
|
tree
2009-12-30
Junio C Hamano
M
e
rge
b
ranch 'maint-
1
.
6
.
1' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2009-12-30
Junio C H
a
mano
M
e
rge b
r
an
c
h 'maint-1
.
6
.
0
'
into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-27
Junio C Ha
m
ano
Merge branch 'nf/maint-fix-in
d
ex-ext-
l
en-on-be64' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
Makefi
l
e: FreeBSD (both 7 and 8) needs
OLD_I
C
ONV
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C Hamano
S
t
a
rt 1
.
6
.
6
.
X maintenance t
r
ack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
unio C Hamano
Me
r
ge branch 'jc/maint-
o
bsd46' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
t4019 "grep" port
a
bility fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C Haman
o
t1200: work arou
n
d a bug
in s
o
me
i
mplem
e
n
tation
s
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
J
u
nio C Hamano
Git
1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Ham
a
no
Merge bra
n
ch
'
main
t
'
commit
|
commitdiff
|
tree
2009-12-20
Juni
o
C Hamano
Git 1
.
6
.
6-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio
C
Hamano
M
erge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-12-16
Ju
n
i
o
C Ham
a
no
Git 1
.
6
.
6-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
M
erg
e
branch 'maint' to sy
n
c with 1
.
6
.
5
.
7
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 Hamano
worktree: don't seg
f
ault with an absolut
e
pathspe
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
J
u
n
i
o
C Haman
o
U
p
date
Rel
e
a
se Note
s
fo
r
1
.
6
.
6 to remove old bugfixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hama
n
o
Sync wit
h
1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Jun
i
o
C
H
a
m
ano
Git 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C H
a
man
o
Fix archi
v
e format with -- on the command line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Juni
o
C
H
aman
o
R
emove po
s
t-uplo
a
d-h
o
o
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Ha
m
ano
Git 1
.
6
.
6
-r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hama
n
o
M
erge
g
it:
/
/repo
.
or
.
cz/git-g
u
i
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ham
a
n
o
Me
r
ge
g
it://git
.
k
e
r
nel
.
o
r
g/pub/scm/gitk/
g
itk
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C
Haman
o
U
p
date draft release notes
to
1
.
6
.
6 before -rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branch
'main
t
'
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C Hamano
Merge branch '
m
m
/
maint-merge-ff-erro
r
-mess
a
ge-f
i
x'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Ha
m
a
n
o
Merge branch
'jn/maint-pull-r
e
base-error-message' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
u
ni
o
C Hamano
Merge branch 'j
k
/maint-add-p-delete
-
fix' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-09
J
u
n
i
o
C
H
a
man
o
M
e
rge git://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Jun
i
o C Hamano
Re
v
ert rec
e
nt
"git mer
g
e
<
msg
>
HEAD <c
o
mmit>
.
.
.
" deprecation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C
Haman
o
Sync w
i
th 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
J
unio C Haman
o
Git 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next