repo.or.cz
/
git
/
jnareb-git
/
bp-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.5' into maint-1.6.6
2010-07-26
Junio C Hamano
Merge branch '
m
ai
n
t-1
.
6
.
5' into maint
-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-07-26
Junio C Haman
o
Merg
e
bran
c
h 'maint-1
.
6
.
4
'
i
nto
m
aint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-03-07
Junio C
Hamano
Merge branch '
j
c/m
a
int-fix-te
s
t-p
e
rm'
i
nt
o
maint-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
unio C Hamano
Merge br
a
nch
'
sp/ma
i
nt-push-
s
ideba
n
d' i
n
t
o m
a
int
-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C
Hamano
Merge branch '
h
m/
m
aint-i
m
ap-send
-
crlf'
into m
a
int-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Hamano
M
e
rg
e
branch
'
gf/
m
ai
n
t
-
sh-setup-n
o
ng
i
t-
o
k
' int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Junio
C Hamano
Merge branch 'jk/maint-rmdir-fix' i
n
to maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Ju
n
io C Hamano
Merge branch 'rs/
o
ptim-te
x
t-wrap' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge b
r
anch 'tr/main
t
-
cherry-pi
c
k-list'
i
nto
m
ai
n
t
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ha
m
ano
Merge bra
n
ch 'cc/maint-b
i
sect
-
pat
h
s' into
m
aint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-05
J
unio C Ham
a
no
Me
r
ge branch
'
maint-1
.
6
.
5' into maint
-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-02-16
Junio C Hamano
Me
r
ge b
r
anch 'mai
n
t-1
.
6
.
5' i
n
t
o ma
i
n
t
-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-02-12
Junio C Hamano
Fi
x
typo in 1
.
6
.
6
.
2 relea
s
e notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
Jun
i
o C Ham
a
n
o
Re-fix ch
e
ck-ref-format do
c
umentation mark-up
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
J
u
nio C H
a
man
o
Git 1
.
6
.
6
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Merge
branch 'maint-1
.
6
.
5' into main
t
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
t8003: check e
x
it code of comma
n
d and
error me
s
s
a
ge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
Juni
o
C Ham
a
no
Mer
g
e
b
r
anch 'sp/
m
aint-fa
s
t
-
im
p
ort-lar
g
e-blob' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Junio
C Hamano
Merge b
r
anch 'g
p
/maint-cv
s
server' into maint
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
M
e
rge branch 'jc/
m
aint-reflog-bad-
t
imestamp'
i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2010-02-10
J
u
n
i
o C
Ha
m
ano
Merge
b
ranc
h
'il/maint-xm
a
llocz' into
m
aint
commit
|
commitdiff
|
tree
2010-02-10
Junio C
Hamano
Merge
b
r
a
nch 'jh/maint-config-file-
p
refix' i
n
to m
a
int
commit
|
commitdiff
|
tree
2010-02-10
Junio
C
Ha
m
ano
Merge branc
h
'
n
d/include
-
t
ermios-for-
o
sol
'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2010-02-10
J
u
nio C Ha
m
ano
Merge branch
'jc
/
maint-1
.
6
.
1-checkout
-
m
-
c
us
t
om-mer
g
e
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Merge branch '
r
s/maint-archive-mat
c
h-pathspec' into
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Ju
n
io C Hamano
check-ref-for
m
at documentation: fix en
u
meration
m
ark-up
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-09
Junio C Haman
o
Merge branch 'maint-1
.
6
.
5
'
into maint
commit
|
commitdiff
|
tree
2010-02-09
J
unio
C
Hama
n
o
Mer
g
e branch
'
j
c
/
main
t
-
push-d
o
c-status' in
t
o maint
commit
|
commitdiff
|
tree
2010-02-09
Junio
C Hamano
g
i
t-p
u
s
h
: documen
t
all the st
a
tus flags used in t
h
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-08
Junio C
Hamano
M
e
rge
branch 'jc/m
a
i
nt-imap-c
o
nfig-pa
r
se' into maint
commit
|
commitdiff
|
tree
2010-02-08
Junio C Hamano
Fix pars
i
ng
o
f
im
a
p
.
pref
o
rmattedHTML and ima
p
.
s
slv
e
ri
f
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-08
Junio C Ham
a
no
M
e
r
ge b
r
a
n
ch
'
jc/maint
-
doc-git-
a
dd-example' into m
a
int
commit
|
commitdiff
|
tree
2010-02-08
Junio C Hamano
g
i
t-add
d
o
c
u
me
n
tation: Fix she
l
l q
u
oting e
x
am
p
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-05
J
u
nio C
H
amano
M
erge bran
c
h 'jc/maint-limit-note-output'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2010-02-01
Junio C Hamano
Merge br
a
nch 'sb/m
a
int-octopus' into
m
aint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-02-01
Junio C Hamano
M
erge branch 'bg/m
a
int
-
add-all-doc' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-31
Juni
o
C Ha
m
a
n
o
l
i
b-patch-mode
.
sh: Fix permission
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-31
Junio
C Hamano
Merge co
m
mi
t
'b31
9
ef7' into jc/maint-fix-test-p
e
rm
commit
|
commitdiff
|
tree
2010-01-30
J
unio C Hamano
t6000lib: Fix per
m
issi
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Juni
o
C Ha
m
ano
Merge
b
r
anch 'maint-1
.
6
.
5
'
i
n
to mai
n
t
commit
|
commitdiff
|
tree
2010-01-27
Junio C
Hamano
t
0101: use a fixe
d
timestamp when sea
r
ching in the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-27
J
unio C Hamano
U
p
date
@{
b
og
u
s
.
time
s
tam
p
}
f
i
x
n
o
t
to die()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-26
Junio C
H
a
ma
n
o
approxidate
_
c
a
reful()
reports
e
r
r
orne
o
us date stri
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-24
Junio
C Hamano
Merge
b
ranch 'ma
i
nt' of git://git
.
s
pear
c
e
.
org/git-gui
.
.
.
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
ign
o
r
e
dupl
i
cated slas
h
es in make_relative_
p
ath()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
J
unio C Ha
m
a
no
merg
e
-r
e
cu
r
siv
e
: do not
return NULL only to
c
ause segfault
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Fix "log --onel
i
ne" n
o
t to show notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio
C H
a
man
o
Merge b
r
anch 'jc/m
a
int-ref
r
esh-i
n
dex-is-optional-
f
or
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Fix "
l
og" family not to b
e
too agressive a
b
out showing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
G
it 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
Hamano
M
erge bran
c
h 'bg/maint-remote-update-def
a
ult' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
Ham
a
n
o
Merge
branch 'sb/maint-o
c
topus' int
o
maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e b
r
anch 'bg/ma
i
nt-add-al
l
-doc'
into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Me
r
g
e
branch
'm
a
in
t
-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
M
e
rge
b
ran
c
h 'j
k
/
maint-1
.
6
.
5-reset-hard' int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
branch 'tr/m
a
in
t
-1
.
6
.
5-bas
h
-prompt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merg
e
branch 'dp/maint-1
.
6
.
5-fast-i
m
port-no
n
-
com
m
it
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Ha
m
ano
Merge branc
h
'jm/maint-
1
.
6
.
5
-
gr
e
p-NUL-terminate'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
status: d
o
n't requi
r
e the repo
s
ito
r
y to
b
e
writable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Haman
o
Merge branch
'
m
aint-1
.
6
.
4
' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Merg
e
branch 'maint-1
.
6
.
3' into
maint
-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Merg
e
b
r
an
c
h 'mai
n
t-1
.
6
.
2' into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
g
e
c
o
mmit
'
v1
.
6
.
4
.
4-8-g8de6518'
i
nto ma
i
nt-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C
Hamano
Fix mis-backpo
r
t of t7
0
0
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Update draft release notes
t
o 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Ha
m
a
n
o
Merg
e
branch
'dp/maint-1
.
6
.
5
-fast-import-non-co
m
mi
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Me
r
ge branch 'jm/maint-1
.
6
.
5-grep-NUL-term
i
nate'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-01-12
Junio
C
H
a
ma
n
o
g
rep: -L
should show em
p
ty file
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Haman
o
Merge
b
r
a
nch 'ma
i
nt-1
.
6
.
2
' into maint
commit
|
commitdiff
|
tree
2010-01-10
Juni
o
C Hamano
Merge br
a
n
ch 'maint-
1
.
6
.
1
' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
M
e
rge bra
n
ch 'main
t
-1
.
6
.
0
'
i
nto main
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
checkout -m: do not try to fall back to --merge from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-06
J
unio
C
Hama
n
o
checkout -m path
:
f
i
x recreating conflict
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-31
J
u
n
io C Hamano
M
erge branc
h
'maint-1
.
6
.
0' int
o
maint
commit
|
commitdiff
|
tree
2009-12-30
J
unio C Ha
m
ano
Merge branch 'ma
i
nt-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-12-30
Junio C Hamano
Me
r
ge branch 'maint-1
.
6
.
0' in
t
o m
a
i
nt-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-27
Junio C Hamano
M
erge branch 'nf/maint
-
fix-index-
e
xt-len-on-b
e
64' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-26
Junio C Haman
o
Makefil
e
: FreeBSD
(both 7 and 8) needs OLD
_
ICONV
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
S
tart 1
.
6
.
6
.
X maint
e
nance
track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
Merge branch 'jc/maint-ob
s
d46' into ma
i
n
t
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
i
o
C Hamano
t4019 "
g
rep" portabil
i
ty fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C
H
amano
t1200: work
a
round a
b
ug in some implement
a
tions of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
Junio C Hamano
Git 1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-20
Junio
C
Hamano
Git 1
.
6
.
6
-
rc
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
J
u
n
io C Haman
o
Merge bran
c
h 'ma
i
nt
'
commit
|
commitdiff
|
tree
2009-12-16
Ju
n
i
o
C
Hamano
G
i
t
1
.
6
.
6-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Ha
m
ano
Merge branch '
m
aint' t
o
sync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
J
u
n
io C Hamano
Git 1
.
6
.
5
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio
C Hama
n
o
worktree: don't se
g
fault with
a
n
absolute
pathspec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Juni
o
C Hamano
Updat
e
Release
Notes for 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 with 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
io C Hamano
G
i
t
1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio C Hama
n
o
Fix archive format with -- on the command line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Remove post-upload-ho
o
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Git
1
.
6
.
6-rc
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Hamano
Me
r
ge git
:
//repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
mano
Merge git:/
/
git
.
kernel
.
org/pub/scm/gitk
/
gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Ham
a
no
Updat
e
d
raft r
e
l
ease
n
otes
t
o 1
.
6
.
6
b
efore -rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next