repo.or.cz
/
git
/
dscho.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-17
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Me
r
ge branch 'cc
/
r
eset-more'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Haman
o
Me
r
ge
b
r
anch 'jc/checkou
t
-merge
-
base'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
Ham
a
no
Merge
branch 'rs/maint-archive-match-pathsp
e
c'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch '
i
l/vcs-helpe
r
'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge
branch 'c
c
/res
e
t-more'
commit
|
commitdiff
|
tree
2010-01-13
Juni
o
C
Hamano
Merge branch 'nd/sparse'
commit
|
commitdiff
|
tree
2010-01-12
Junio
C
Hamano
Merge br
a
nch 'm
a
int'
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
grep: -L shou
l
d show empty fil
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Junio
C Ha
m
ano
Me
r
ge branch 'tr/htt
p
-
u
pda
t
es'
commit
|
commitdiff
|
tree
2010-01-10
Junio
C Ha
m
a
no
Merge branch
'jk/m
a
int-1
.
6
.
5-
r
eset-hard'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hama
n
o
Mer
g
e branch
'
jk/push-to-delete'
commit
|
commitdiff
|
tree
2010-01-10
Junio C
Ham
a
no
Merge
b
ra
n
ch 'mm/config-path'
commit
|
commitdiff
|
tree
2010-01-10
Junio
C
Hamano
Merge bran
c
h 'pm/
c
vs-environ'
commit
|
commitdiff
|
tree
2010-01-10
Junio C
H
ama
n
o
Mer
g
e branch 'tr/maint-1
.
6
.
5-ba
s
h-prompt-s
h
ow-
s
ubmodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-10
Ju
n
io C Hamano
Merg
e
bran
c
h '
b
g/maint-remote-upda
t
e
-default'
commit
|
commitdiff
|
tree
2010-01-10
J
unio C
Ham
a
n
o
Merge branch
'
m
m
/
d
iag-pat
h
-in-treeish'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Ha
m
ano
Merge branch 'fc/opt-quiet-gc-r
e
se
t
'
commit
|
commitdiff
|
tree
2010-01-10
Juni
o
C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2010-01-10
Juni
o
C
Hama
n
o
Merge branch 'maint-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2010-01-10
Ju
n
io C Hamano
Me
r
ge branch 'ma
i
nt-1
.
6
.
1' into
maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'maint-1
.
6
.
0
'
into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-07
Junio
C Hamano
Describe second
ba
t
ch f
o
r
1
.
7
.
0 in dra
f
t rele
a
se no
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
Junio C Ha
m
ano
Merge branch 'js/filter-branch-prime'
commit
|
commitdiff
|
tree
2010-01-07
Junio C
H
aman
o
Merge bran
c
h 'sb/ma
i
nt-oc
t
opus'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Merge
b
r
anc
h
'mg/tag-d-
s
how'
commit
|
commitdiff
|
tree
2010-01-07
J
unio
C Ha
m
ano
Merge
b
ranc
h
'
so/cvsserver-
u
pdate'
commit
|
commitdiff
|
tree
2010-01-07
Ju
n
io
C
Hamano
Merge branch '
b
g/maint-add-all-doc'
commit
|
commitdiff
|
tree
2010-01-07
J
unio C Hamano
Merge branch 'mv/commit-date'
commit
|
commitdiff
|
tree
2010-01-07
J
u
nio C Haman
o
Merge branch 'mo
/
bin-wrappers'
commit
|
commitdiff
|
tree
2010-01-07
Jun
i
o C Hamano
che
c
kout -m:
d
o n
o
t
t
ry
to
fall back to --merge
f
rom
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-06
Jun
i
o C Hamano
.
g
i
t
a
ttribu
t
es:
d
etect 8-spac
e
indent in she
l
l script
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
J
unio C Hamano
F
ix b
i
t
assignment
f
or CE_
C
ONFLICTED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio C
Hamano
"r
e
set
--merge
"
: fi
x
un
m
e
r
ged case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-03
Juni
o
C
H
amano
Merge bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2009-12-31
Junio C
H
a
m
a
no
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2009-12-31
Jun
i
o C Ham
a
no
Merge branch
'
m
a
int-1
.
6
.
0'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-30
Jun
i
o C Ha
m
ano
M
e
rge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-30
Ju
n
io C
H
amano
Merge branch 'ma
i
n
t
-1
.
6
.
1
'
int
o
ma
i
nt
commit
|
commitdiff
|
tree
2009-12-30
Junio
C Hamano
M
e
rge b
r
anch 'mai
n
t-1
.
6
.
0' into ma
i
nt-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-29
Ju
n
io
C Hamano
Re
m
ove http
.
authAny
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-28
Juni
o
C
Hamano
Merge branch
'
jk/1
.
7
.
0
-
s
t
atus'
commit
|
commitdiff
|
tree
2009-12-28
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-27
Junio C Hamano
M
e
rge
br
a
nch 'nf/ma
i
nt-fix-index-
e
xt-len-on-be64'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-26
Junio C
H
amano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C
Ham
a
n
o
Makefile: FreeBSD (both 7
and 8
)
nee
d
s OLD_ICONV
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C
H
ama
n
o
Start
1
.
6
.
6
.
X m
a
intenanc
e
track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Haman
o
Merge b
r
a
nch 'jc/maint-
o
bsd4
6
'
i
nt
o
maint
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
Kick
off 1
.
7
.
0
c
ycl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
Hamano
Merge branch
'
gb/1
.
7
.
0-diff-wh
i
tesp
a
ce-only-output
'
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
io C
H
amano
Merge branch
'jc/1
.
7
.
0-
d
iff-w
h
itespac
e
-only-status'
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C
Hama
n
o
Merge branch 'jc/1
.
7
.
0-pu
s
h-saf
e
ty
'
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hama
n
o
Mer
g
e branch
'jc/1
.
7
.
0
-send-email-no-thread-defau
l
t'
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ham
a
no
Merge branch
's
r
/
v
c
s-helper'
commit
|
commitdiff
|
tree
2009-12-26
Junio C H
a
mano
t4019 "grep" portability fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C H
a
mano
t1200: work around a bug in
some implementations of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Junio C Ham
a
no
Git
1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
J
u
nio C
Haman
o
Me
r
g
e
branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-20
J
unio C Hamano
G
it 1
.
6
.
6-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
J
u
nio C Hamano
M
e
rge branch
'maint'
commit
|
commitdiff
|
tree
2009-12-16
Junio C Ham
a
no
Git
1
.
6
.
6-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
u
nio
C
H
aman
o
M
e
rge bra
n
ch '
m
aint' to sync with
1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio C
H
amano
Git 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Ham
a
no
worktree: don't
segfault wit
h
an absolute
p
athspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
J
unio C
Hamano
status
/
commit: do not
sugg
e
st
"reset
H
E
A
D
<path>" while
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Junio C Ha
m
a
n
o
commit/status
:
"
g
it add <p
a
th>" is
not neces
s
arily
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Junio C Hamano
co
m
mit/stat
u
s: ch
e
c
k $GI
T
_DIR/MERGE_
H
EAD only once
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
Update Release Notes for
1
.
6
.
6 to remov
e
old bugfi
x
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
Sync with 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C
Hamano
Git 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Fix archi
v
e format
w
ith -- on the
c
o
mmand line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hama
n
o
Remove
post-uplo
a
d-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
io C Hamano
G
it 1
.
6
.
6-r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ham
a
no
Merge git://r
e
p
o
.
or
.
cz/git-
g
ui
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge gi
t
://git
.
kern
e
l
.
o
rg/pub
/
scm/gitk/git
k
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Ha
m
ano
Update d
r
a
f
t
r
e
lea
s
e
no
t
es to 1
.
6
.
6 before -rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
a
mano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Hama
n
o
Merg
e
b
r
anch
'mm/maint-merge-ff-error-mes
s
a
ge-fix
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
un
i
o C Hamano
Merg
e
branch 'jn/maint
-
p
u
ll-reb
a
se-
e
rro
r
-
message' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Me
r
ge br
a
nch 'jk/maint-add-p-delete-fix' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C Hamano
Merge git://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio
C Ha
m
ano
Reve
r
t
recent "git merge <msg>
HEAD <commit>
.
.
.
"
deprecat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-07
Junio C Hamano
Mer
g
e bran
c
h 'master' into il/vcs-helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Ju
n
io C H
a
m
ano
Sync with
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C
Hamano
Git 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Mer
g
e br
a
nc
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
n
o
Prepare for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Haman
o
Merge branc
h
'uk/main
t
-s
h
ortlog-encoding' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
am
a
no
Merge branch 'fc/m
a
int-format-
p
atch-pathspec
-
dashe
s
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge branch 'ap/maint-merge
-
strategy-list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge b
r
a
n
ch 'jc/maint-am-keep' int
o
m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
M
e
rge branch 'rs/work-aroun
d
-grep-opt-
i
n
sanit
y
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
M
erg
e
b
r
a
nch 'rj/maint-cygwin-
c
ount-object
s
' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merge branch 'mm
/
maint-hint-failed-m
e
rge' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
uni
o
C Haman
o
Merge branch
'
t
h/mai
n
t-remo
t
e
-
update-help-
s
tring
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
er
g
e branch 'rj/maint-t9700' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C
H
a
m
a
n
o
Merge branch
'
ls/maint-
m
ailinfo-no-inbody' in
t
o
maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
ni
o
C
Ham
a
no
M
e
rge
b
r
a
nch 'mo/
m
ai
n
t-crl
f
-
doc' into maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
Haman
o
Merge branch 'th/rem
o
te-usage' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e branch
'pb
/
m
a
in
t
-
u
se-custom-perl' into
maint
commit
|
commitdiff
|
tree
next