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 'maint'
2010-01-10
Junio C Hamano
M
e
rg
e
b
ra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'm
a
i
nt-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2010-01-10
J
u
n
io C Hamano
Merge
branc
h
'm
a
in
t
-1
.
6
.
1' int
o
m
a
i
n
t-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch
'
maint-1
.
6
.
0'
i
nto mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-07
Junio C
Hamano
Describe s
e
cond batch for 1
.
7
.
0 in d
r
aft release notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
Junio C Haman
o
Mer
g
e branch 'js/
f
i
l
ter-branch-
p
rime'
commit
|
commitdiff
|
tree
2010-01-07
J
u
nio C H
a
mano
Merge branch 'sb/ma
i
nt-octopus'
commit
|
commitdiff
|
tree
2010-01-07
J
un
i
o
C Hamano
Me
r
ge branch 'mg/ta
g
-d
-
sho
w
'
commit
|
commitdiff
|
tree
2010-01-07
Junio
C
Hamano
Merge branch 'so/cvsserver-up
d
ate'
commit
|
commitdiff
|
tree
2010-01-07
J
unio C Hamano
M
erge branch 'bg/maint-add
-
all-doc'
commit
|
commitdiff
|
tree
2010-01-07
J
u
nio C H
a
man
o
Merge branch
'mv/commit-date'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Ha
m
ano
Merg
e
bra
n
ch '
m
o/
b
in-wrappers'
commit
|
commitdiff
|
tree
2010-01-07
Juni
o
C Hamano
ch
e
ckout -m:
d
o not try to
fall
back to --merge f
r
om
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jun
i
o
C Hamano
.
gitattributes: detect
8-sp
a
ce indent in shell scripts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-03
Ju
n
io C Hamano
M
er
g
e branc
h
'maint'
commit
|
commitdiff
|
tree
2009-12-31
Ju
n
i
o C Haman
o
Me
r
g
e bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-12-31
J
u
ni
o
C Hamano
Merge b
r
anch 'maint-
1
.
6
.
0
' into maint
commit
|
commitdiff
|
tree
2009-12-30
Junio C Ha
m
ano
Merge b
r
anch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-30
J
u
nio
C H
a
mano
Merge
branch 'maint
-
1
.
6
.
1'
i
nto main
t
commit
|
commitdiff
|
tree
2009-12-30
Junio C Hamano
Me
r
ge branch
'main
t
-
1
.
6
.
0' into main
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-28
J
un
i
o
C Haman
o
Merge
bran
c
h
'jk/1
.
7
.
0
-st
a
tus'
commit
|
commitdiff
|
tree
2009-12-28
Junio C H
a
mano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2009-12-27
Junio C
H
amano
Merge b
r
anch '
n
f/maint-fix-index-e
x
t-l
e
n
-
on-be64
'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-26
J
u
nio C
H
amano
M
akefile: FreeBSD (both
7
and
8)
n
e
e
d
s
OL
D
_ICONV
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
Hamano
Start
1
.
6
.
6
.
X
ma
i
nten
a
n
c
e track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C
H
amano
Merge branch '
j
c/maint
-
obsd46'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2009-12-26
Junio
C Haman
o
Kick off 1
.
7
.
0
c
yc
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
J
u
nio C H
a
mano
Merge
b
ran
c
h 'gb/1
.
7
.
0-
d
iff-w
h
itespace-onl
y
-out
p
ut
'
commit
|
commitdiff
|
tree
2009-12-26
J
u
n
io C
Haman
o
Merge bra
n
ch
'
j
c/
1
.
7
.
0
-
diff-whi
t
e
s
pac
e
-only-status'
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C Hamano
Merge b
r
a
nch 'jc
/
1
.
7
.
0-push-
s
afety
'
commit
|
commitdiff
|
tree
2009-12-26
J
unio C H
a
mano
M
e
r
g
e
branc
h
'jc
/
1
.
7
.
0-send-e
m
ail-
n
o
-thre
a
d-default'
commit
|
commitdiff
|
tree
2009-12-26
J
unio C
H
amano
Merge bra
n
ch 'sr/vcs-helper'
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
Hamano
t4019 "gr
e
p" portability fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C Hamano
t1200:
w
o
rk aroun
d
a b
u
g in some
i
m
plem
e
ntations of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
Junio
C
Hama
n
o
Gi
t
1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
Junio C H
a
m
a
no
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-12-20
Junio C H
a
mano
Gi
t
1
.
6
.
6
-
rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio
C Hamano
Merge
b
r
anch
'
maint'
commit
|
commitdiff
|
tree
2009-12-16
Junio C
H
amano
Git 1
.
6
.
6-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hama
n
o
Merg
e
branch 'mai
n
t
'
to
s
y
n
c
with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Git 1
.
6
.
5
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
workt
r
ee
:
d
o
n
't
s
egfaul
t
with an absolut
e
pathspec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-12
Junio C Hama
n
o
sta
t
us/c
o
mmi
t
:
d
o not
suggest "reset HEAD <pa
t
h
>
"
while
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-12
Junio C Hamano
com
m
it
/
st
a
tus: "git add <pa
t
h>" i
s
not necessaril
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-12
Junio
C Haman
o
commit/status: check $
G
IT
_
DIR
/
MERGE
_
HE
A
D only o
n
ce
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Jun
i
o C Hamano
Update
R
elease
Notes for 1
.
6
.
6 to remove old
bug
f
i
x
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
Sync w
i
th 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio
C Hamano
G
i
t 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Ha
m
a
n
o
Fix arch
i
v
e
format
w
i
th
-
- on the command l
i
ne
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
i
o C Ha
m
ano
Remove post-up
l
oad-hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Git 1
.
6
.
6-
r
c2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Ha
m
ano
Merge g
i
t://
r
epo
.
or
.
c
z/git-g
u
i
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git
:
//git
.
ker
n
el
.
org/pub/s
c
m/gitk/gitk
commit
|
commitdiff
|
tree
2009-12-09
J
u
n
io C Hamano
Update draft release n
o
te
s
to 1
.
6
.
6 b
e
fore -rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
J
unio C
H
amano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge
b
ranch 'm
m
/m
a
in
t
-merge-ff-error-message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o
C Hamano
Merge branch
'
jn/maint-
p
ull-rebase-error-me
s
s
a
ge' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C H
a
mano
M
e
rge branc
h
'
jk/maint-add-p-delete
-
f
i
x' into
m
aint
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hama
n
o
Merge gi
t
://git
.
bogomips
.
org/g
i
t-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio
C
Hamano
Revert recent "git m
e
rge <msg
>
H
E
A
D
<
c
o
mmit>
.
.
.
" dep
r
ecation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
J
unio C Ham
a
no
Sy
n
c with 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
J
u
nio C H
a
m
a
no
Git 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Prep
a
re for 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
M
erge br
a
nch 'uk
/
maint-shor
t
log-encoding' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ham
a
no
Mer
g
e branch 'fc/maint-forma
t
-patch-pathspe
c
-dashe
s
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io
C Hamano
Merge branch 'ap/maint-merge
-
strate
g
y
-list
-
fi
x
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
n
o
Merge branch 'jc/mai
n
t-a
m
-
k
e
ep' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
M
e
rge branch 'rs/work-around
-
g
rep-o
p
t-
i
n
sanity' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'rj/m
a
int-cyg
w
in-count
-
obj
e
cts' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Me
r
g
e branch 'mm/main
t
-hint-fail
e
d
-
merge' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
m
ano
Mer
g
e bran
c
h 'th/maint-remote-upd
a
te-help-stri
n
g' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
M
e
r
ge b
r
anch '
r
j/maint-t9700' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
Ha
m
ano
Merg
e
branch
'ls/main
t
-mailinfo-n
o
-inbody' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge b
r
anch 'm
o
/maint-crlf-doc' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C
Hamano
Merge branch 'th/r
e
mote
-
usage' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
M
e
rge
b
ranch 'pb/maint-use-custom-p
e
rl' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge branch 'm
m
/c
o
nfig-pat
h
name-til
d
e-expand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
mano
Merge branch 'bc/grep-i
-
F' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ha
m
a
no
Merge
b
ranch 'jk/maint-break-rename-reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C Hamano
Mer
g
e
b
r
a
n
ch
'
r
j/mai
n
t-simplify-cy
g
win-makefile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C
Hamano
Merge branch 'rg/doc-workflow' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C
Hamano
Merge branch
'
np/maint-sideban
d
-
f
avor-sta
t
us'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
man
o
Documentation:
xmlto 0
.
0
.
18 does not know --stringparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
in
1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
m
a
n
o
Gi
t
1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
H
ama
n
o
U
n
condition
a
lly set
m
an
.
b
a
se
.
url
.
for
.
rel
a
tive
.
l
i
nks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
unio
C
H
amano
Git
1
.
6
.
6-r
c
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ham
a
n
o
Me
r
ge branch
'
maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Prepar
e
for 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C Hamano
merge: do not add standard m
e
ssage w
h
en m
e
ssag
e
is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
unio C
H
ama
n
o
Do not misidentify "git merge foo HEAD" a
s
an
o
l
d-sty
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Update draft release notes to
1
.
6
.
6 bef
o
re -rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
M
e
rge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io C Ha
m
ano
Me
r
ge
b
ranch 'jc/deprecate-ol
d
-syntax-fro
m
-me
r
ge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
git-merge
:
a deprecation notice
of the ancient
command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio
C
Hamano
Merge branch
'bw/r
e
mote-get-
r
e
f-states-fi
x
'
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io
C
Hamano
Merge branch 'jn/g
i
tweb-bl
a
m
e
'
commit
|
commitdiff
|
tree
2009-11-30
J
u
n
io C Haman
o
Merge branch 'fc/ma
i
n
t-format-p
a
tch-path
s
pec-dashes'
commit
|
commitdiff
|
tree
next