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 'da/difftool'
2010-01-07
Juni
o
C Hama
n
o
Merge branch '
m
o/bin-wrappe
r
s'
commit
|
commitdiff
|
tree
2010-01-07
Jun
i
o C Hama
n
o
checkou
t
-m
:
d
o not try to fal
l
back to
-
-merg
e
from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-06
J
u
nio C H
a
mano
chec
k
out
-m path:
fix recreating
c
onflic
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-06
J
unio C Hamano
.
gitattribu
t
es
:
detect 8-sp
a
ce indent in
s
hell s
c
r
ipts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio
C Ham
a
no
Fix
b
it assignmen
t
f
o
r
CE_CONFLICTE
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
J
unio C Hamano
"reset --
m
er
g
e":
fix unmerged case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-03
Junio C Hamano
Merge
b
ranch 'maint
'
commit
|
commitdiff
|
tree
2009-12-31
Junio C
H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-31
Juni
o
C Ham
a
no
Merge branch 'main
t
-1
.
6
.
0' into maint
commit
|
commitdiff
|
tree
2009-12-30
J
u
n
i
o
C
Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-12-30
Junio C Hamano
Merge b
r
a
n
ch 'mai
n
t-1
.
6
.
1
'
in
t
o maint
commit
|
commitdiff
|
tree
2009-12-30
Jun
i
o
C Ham
a
n
o
Merge b
r
anch '
m
aint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-29
Juni
o
C Hamano
Remove http
.
aut
h
Any
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-28
J
u
n
io C Hamano
Merge branc
h
'jk/1
.
7
.
0-s
t
atus'
commit
|
commitdiff
|
tree
2009-12-28
J
unio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2009-12-27
Jun
i
o C
Hamano
Merge branch 'n
f
/maint-fix-
i
ndex-ext-len-on-be64'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C
Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-12-26
Junio C
H
amano
Ma
k
efile: FreeB
S
D (b
o
th
7 an
d
8) n
e
eds O
L
D_I
C
ONV
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
H
a
mano
Start 1
.
6
.
6
.
X main
t
enanc
e
track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C
Hama
n
o
Merge branch
'jc/main
t
-
o
bsd
4
6
'
in
t
o maint
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
Ki
c
k
o
ff 1
.
7
.
0 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C Hamano
Me
r
ge branch 'gb/1
.
7
.
0
-
diff-whit
e
sp
a
ce-onl
y
-output'
commit
|
commitdiff
|
tree
2009-12-26
Junio
C Hamano
Merge branch
'
jc/1
.
7
.
0-diff-w
h
itespace-onl
y
-statu
s
'
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
Merge branch 'jc
/
1
.
7
.
0-pu
s
h-safety'
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C H
a
m
ano
M
erge branch
'jc/
1
.
7
.
0-send-emai
l
-no-
t
hread-d
e
fault'
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ha
m
ano
Merge bra
n
ch 'sr/vcs-he
l
pe
r
'
commit
|
commitdiff
|
tree
2009-12-26
J
u
ni
o
C Hamano
t4019 "grep" portabil
i
ty fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ha
m
ano
t1200: w
o
rk around a bug in s
o
me implementations
o
f
.
.
.
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
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-20
Junio C
H
amano
Git 1
.
6
.
6-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Jun
i
o
C
Hama
n
o
Merge b
r
anch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-16
J
unio C Hamano
Git 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 br
a
nch 'maint' to sync wi
t
h 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 Hama
n
o
worktre
e
: don'
t
s
e
gfault
w
ith an ab
s
olute pathsp
e
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Ju
n
i
o C Hamano
status/commi
t
: do not sugges
t
"re
s
et HEAD <p
a
th>" w
h
il
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Ju
n
io
C
Hamano
co
m
mi
t
/status: "g
i
t add <path>" is n
o
t
necess
a
rily
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Junio C
Hamano
commit/status:
c
heck $GIT_DIR/ME
R
GE
_
HEAD on
l
y on
c
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C
Hamano
Up
d
ate 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 Hamano
Sy
n
c wit
h
1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Juni
o
C
Hamano
Git 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio C
H
ama
n
o
F
i
x
archive for
m
at with -
-
on
the
comman
d
line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C
H
a
mano
Remove po
s
t-upload-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Juni
o
C Haman
o
Git 1
.
6
.
6
-
rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Haman
o
Merge git://repo
.
or
.
cz/g
i
t-g
u
i
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Haman
o
Merge git:
/
/
g
it
.
kernel
.
or
g
/
p
ub/s
c
m/git
k
/gitk
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C Hamano
Update dr
a
ft 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 bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2009-12-09
J
uni
o
C
H
amano
Merge branch 'm
m
/maint-merge-ff-
e
rror-me
s
sage-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
M
er
g
e branch 'jn/maint-p
u
ll-rebase-err
o
r-mes
s
age' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
u
ni
o
C Ha
m
ano
Merge branch 'jk/maint-add-
p
-delete-fix' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ham
a
no
Merge git://git
.
bog
o
mips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C Hamano
Revert re
c
e
n
t "git merg
e
<msg> HEAD
<commit>
.
.
.
"
dep
r
ecat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-07
Junio C Haman
o
Merge branch 'master'
i
nto il
/
vcs-h
e
l
per
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Ha
m
ano
Sync with
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
J
unio C Hamano
G
it 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Junio C Hamano
Teac
h
--[no-]rerere-
a
u
t
oupdate optio
n
to merge, r
e
vert
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bran
c
h '
m
a
i
nt'
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C H
a
mano
Prepare for
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Merge br
a
n
ch 'uk/maint-shor
t
log-enco
d
i
ng' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge b
r
anch 'fc/
m
aint-format-pa
t
ch-pat
h
s
p
ec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Ha
m
ano
Merge
b
ranch 'ap/maint-merge-strategy-list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
uni
o
C Hamano
Merge branch 'jc/
m
aint-am-keep' into ma
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge branch 'r
s
/
wo
r
k-aroun
d
-grep-op
t
-
i
nsanity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ha
m
an
o
M
erge branch
'
rj
/
m
aint-cygw
i
n-count-object
s
' into maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hama
n
o
Merge branch 'mm/maint-hint-f
a
iled-merge' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge branch 'th
/
maint-remot
e
-u
p
date-
h
e
lp-s
t
ring' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge branch 'rj/ma
i
nt-t9700' into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C
Hamano
Merg
e
br
a
nc
h
'ls/main
t
-
m
ailinfo-no-inbody'
into m
a
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
m
a
n
o
Me
r
ge
branch '
m
o/maint-cr
l
f-d
o
c' into maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Haman
o
Merge b
r
a
n
ch 'th/remote
-
us
a
ge
'
into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge b
r
a
n
ch 'pb/mai
n
t
-u
s
e-custom-perl' in
t
o
m
ain
t
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge branch 'mm/
c
onfig-pa
t
hn
a
me-ti
l
de-e
x
p
a
nd' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
Ha
m
ano
Merge
b
ranch 'bc
/
grep-i-F' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
ranch
'
jk/maint-br
e
ak-rename-reduce-memor
y
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge b
r
a
n
c
h 'rj/maint-simplify-cy
g
w
in-mak
e
f
i
le' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
M
e
rge branch '
r
g
/
doc-workflow' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
H
amano
M
erge branch
'np/maint-sideb
a
n
d-favor-status' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Doc
u
mentation:
xmlto 0
.
0
.
18 does not kn
o
w --str
i
ngparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merg
e
in 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
man
o
Unconditionally set m
a
n
.
b
ase
.
ur
l
.
f
o
r
.
r
e
l
ative
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erge branch '
m
aint'
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Haman
o
Do
c
umentatio
n
/Makefile: allow man
.
base
.
url
.
for
.
relative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C
Hamano
G
it 1
.
6
.
6-
r
c
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hama
n
o
Merge
b
ran
c
h
'
maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C H
a
mano
Pr
e
pare
f
or 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
merg
e
:
do n
o
t add standard message whe
n
messag
e
is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Jun
i
o
C H
a
mano
Do not mi
s
identify
"git merge
fo
o
HE
A
D" as an old-
s
ty
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ham
a
n
o
U
pdate
d
raft
r
ele
a
s
e notes t
o
1
.
6
.
6 before -rc
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
J
unio C Hamano
Merge b
r
anc
h
'
maint'
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
i
o C Ha
m
a
no
Mer
g
e branch 'jc
/
d
ep
r
ecate-old-sy
n
tax-from-me
r
ge
'
commit
|
commitdiff
|
tree
2009-12-01
Junio C
H
amano
git-merg
e
:
a de
p
r
e
c
at
i
on notice
of the ancient comma
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o C Ha
m
ano
Merge
b
ranch
'bw/remote-ge
t
-
ref-states-f
i
x'
commit
|
commitdiff
|
tree
2009-12-01
J
unio C Hamano
Merge
branch 'jn/gitwe
b
-blame'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C Hamano
Me
r
ge
b
ranch
'
fc/main
t
-format-patch-pathspec-dashe
s
'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C Hamano
Merge branch 'mm/maint-merge-ff
-
error-mess
a
ge-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ha
m
ano
Merge
b
ranch 'ap/main
t
-merge-strategy-lis
t
-
f
i
x'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge br
a
nch
'j
c
/prett
y
-
lf'
commit
|
commitdiff
|
tree
next