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' of git://git.spearce.org/git-gui into maint
2010-01-24
Junio C Hama
n
o
Merge
b
ranch 'maint' of
g
it://git
.
spearce
.
org/git-gu
i
.
.
.
commit
|
commitdiff
|
tree
2010-01-22
Juni
o
C Hamano
ignore
duplica
t
ed
s
l
ashes i
n
m
a
k
e_
r
elative_path()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
merge-recursive:
do not
ret
u
rn NULL only to
c
au
s
e s
e
gfault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge br
a
nch
'jc/maint-refresh-
i
n
d
e
x-is-opti
o
nal-for
.
.
.
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
u
n
i
o C
H
amano
Merge branch 'bg
/
maint-remote-update-
d
efault'
int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge bra
n
ch 'sb/maint-octopu
s
' into
m
aint
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Mer
g
e branch 'bg/maint-add-
a
ll-doc' int
o
maint
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge branch
'maint-1
.
6
.
5
'
i
nto maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
G
it 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
a
no
Merge bran
c
h 'jk/maint-1
.
6
.
5-reset-hard' into mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
ama
n
o
Merge branch 'tr/m
a
int-1
.
6
.
5-bash-p
r
ompt-show
-
s
u
bmodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
M
e
r
ge branch 'dp/maint-1
.
6
.
5-fast-import
-
non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
an
o
Merge branch 'jm/maint-1
.
6
.
5
-grep-NUL-term
i
nate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
statu
s
: don't
r
equire t
h
e repository
t
o be w
r
itable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
M
e
rg
e
bra
n
ch 'mai
n
t-
1
.
6
.
4' into
maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
i
o C Ham
a
no
Me
r
ge branch 'm
a
int-1
.
6
.
3' in
t
o maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge b
r
anch '
m
aint-1
.
6
.
2'
into maint
-
1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
m
ano
Merge
c
o
mmit 'v1
.
6
.
4
.
4-8-g8
d
e6518'
i
nto
main
t
-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
i
o C
Hamano
Fix mis-backport of t700
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Upd
a
te draft
r
el
e
ase
note
s
to
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Haman
o
Mer
g
e branch
'dp/maint
-
1
.
6
.
5-fast-i
m
p
o
rt-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merge branch 'jm/m
a
int-
1
.
6
.
5-grep-NUL-terminat
e
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
gre
p
: -L
should s
h
o
w
e
mpty files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch
'maint-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2010-01-10
Junio C Ha
m
ano
Merge
branc
h
'
ma
i
nt-1
.
6
.
1' into m
a
int-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'maint-1
.
6
.
0' into mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
checkout -m: do not try
t
o fall b
a
ck to --merge from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-31
Jun
i
o
C Hamano
Merge
b
ranch 'maint-1
.
6
.
0
' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-30
Jun
i
o C Hamano
Merge branc
h
'maint-1
.
6
.
1'
int
o
maint
commit
|
commitdiff
|
tree
2009-12-30
J
u
n
i
o C
H
amano
Merge branch 'maint-1
.
6
.
0' i
n
t
o maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-27
Junio C Ha
m
a
no
Merge b
r
anch 'nf/maint-fix-i
n
dex-ext
-
l
e
n-on-be64' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-26
Junio C
H
am
a
no
Mak
e
file: FreeBSD
(
both 7 and
8) need
s
OLD_ICONV
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Haman
o
Start 1
.
6
.
6
.
X
maint
e
nan
c
e
tra
c
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
H
amano
Merge branch
'
jc/maint-obsd46' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C Hamano
t4019 "grep" p
o
rta
b
ilit
y
fi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C Haman
o
t
1200:
w
ork around a bu
g
in some implem
e
ntati
o
n
s of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Junio C
H
amano
Git 1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Junio C
Hamano
M
e
rge branch 'main
t
'
commit
|
commitdiff
|
tree
2009-12-20
J
un
i
o C Hamano
G
i
t
1
.
6
.
6-
r
c4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C
H
aman
o
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Git 1
.
6
.
6
-r
c
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Merge bran
c
h 'main
t
' to syn
c
with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio C Haman
o
Git 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Ha
m
ano
work
t
ree:
don't se
g
f
ault with an abs
o
l
u
te pathspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
Update Release Note
s
for 1
.
6
.
6 to remo
v
e old bugfixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Ham
a
no
Sync with 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Ham
a
n
o
Git 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Jun
i
o C Hamano
Fix archive format with -- o
n
the
c
o
mm
a
nd line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
u
ni
o
C H
a
ma
n
o
Remov
e
post-
u
p
load-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C
Ham
a
no
G
i
t
1
.
6
.
6-r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C
Hamano
Merge git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-12-09
J
u
n
io C
H
a
m
ano
Merge g
i
t://gi
t
.
kernel
.
o
r
g/pub/scm/gitk/git
k
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Haman
o
Up
d
ate draft
release
n
ote
s
to
1
.
6
.
6
b
e
for
e
-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
J
uni
o
C H
a
mano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2009-12-09
J
unio C
H
am
a
no
Merg
e
branch 'm
m
/mai
n
t
-merge-ff-err
o
r-message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Haman
o
Merge branch 'jn
/
maint-pull-rebase-error
-
mess
a
ge' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hama
n
o
Merge bran
c
h 'jk/maint-add
-
p
-
delete-fix
'
into
maint
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge g
i
t
:
//git
.
b
ogomips
.
org/g
i
t
-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C
H
amano
Reve
r
t recent "git
m
erge <msg> HEAD
<
comm
i
t>
.
.
.
" d
e
pre
c
ati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio
C Hamano
Sync with 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C
Ham
a
no
Git 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
P
re
p
are
for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge bran
c
h
'
uk
/
ma
i
n
t-shortlo
g
-encodi
n
g' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge branch 'fc/maint-format-patch-pathspe
c
-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branc
h
'ap/ma
i
nt-merge-s
t
rategy-list
-
fi
x
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
branch 'jc/maint-a
m
-keep' into m
a
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
M
e
rge branc
h
'rs/work
-
around-grep-opt-insanity' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
r
a
n
ch 'rj/maint-cygw
i
n
-
c
o
u
nt-obj
e
ct
s
' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
b
r
anc
h
'mm/
m
aint
-
hint-failed-merge' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge branch '
t
h/maint-r
e
mote-update-help-string' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge branch
'rj/maint-t9700
'
i
nto
mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Me
r
ge bran
c
h 'ls/m
a
int-mail
i
nfo-no
-
inb
o
dy' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branc
h
'mo/maint-crlf
-
doc' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Me
r
ge branch 'th/re
m
ote-usage' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C
Hamano
Merge bran
c
h 'pb/maint-use
-
custom-perl'
i
n
to
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C
Hamano
Merge branc
h
'mm/con
f
ig-pathna
m
e-tilde
-
e
x
p
and' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hama
n
o
M
erge br
a
nch 'bc/
g
rep-i-F
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C H
a
mano
Merge branch 'jk/maint-break-rename-reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merge branch 'rj/
m
aint-simplify-cygwin-
m
akefile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hama
n
o
M
erg
e
bran
c
h
'
rg/doc-workflow
'
into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Mer
g
e
b
ranch 'np/maint-sideband-favor-status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C
Hamano
Documenta
t
ion:
x
mlt
o
0
.
0
.
1
8
do
e
s
no
t
know --s
t
ring
p
ara
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
M
e
rge in
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Ha
m
a
n
o
G
i
t 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
U
ncon
d
itio
n
ally
s
et man
.
b
ase
.
ur
l
.
f
o
r
.
relative
.
l
ink
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merge bran
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2009-12-03
J
un
i
o
C
Hamano
Docume
n
tation/Makef
i
le: allow man
.
base
.
url
.
for
.
relative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
J
u
n
io C Hamano
Gi
t
1
.
6
.
6-r
c
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Jun
i
o C
Hamano
Me
r
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Prepa
r
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 st
a
ndar
d
m
e
ss
a
ge
wh
e
n message is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Jun
i
o C Hamano
Do not misid
e
nt
i
f
y "git
m
er
g
e
f
oo HEAD" as
a
n
old-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Juni
o
C Ha
m
ano
U
p
date d
r
aft release no
t
es
t
o 1
.
6
.
6 bef
o
r
e -rc
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
Hamano
Merge br
a
n
c
h 'maint
'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge bran
c
h 'jc/depre
c
ate-ol
d
-syn
t
ax
-
from-mer
g
e'
commit
|
commitdiff
|
tree
2009-12-01
Junio
C Ha
m
ano
git-merge: a deprecation n
o
tice of
th
e
an
c
ient
command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C Hama
n
o
Merge bran
c
h 'bw/remote-get-ref-states
-
fix'
commit
|
commitdiff
|
tree
2009-12-01
Junio C H
a
mano
Merg
e
branch 'jn/gitweb-
b
la
m
e'
commit
|
commitdiff
|
tree
next