repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
"reset --merge": fix unmerged case
2010-01-04
Junio C Hamano
"reset --me
r
ge":
f
i
x unm
e
rged case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
J
u
n
io
C
H
a
m
ano
Git 1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Juni
o
C Hama
n
o
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-20
Junio C Hamano
Git
1
.
6
.
6-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Ju
n
io C Hamano
Merge
branch
'
maint'
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Git 1
.
6
.
6-
r
c3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
u
nio C Hama
n
o
Merge branch 'maint' t
o
syn
c
with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
J
u
nio C
Ha
m
ano
Gi
t
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: don't segf
a
ul
t
w
ith an
a
bsolute
p
athspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Juni
o
C
Hamano
U
p
date Re
l
ease Notes
f
or
1
.
6
.
6 to remove old bug
f
ixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Ha
m
ano
S
ync with 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Ham
a
no
Gi
t
1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
io
C Ha
m
ano
Fix arch
i
ve f
o
rma
t
wi
t
h --
on the command line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C H
a
mano
Remove post-upload-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
Juni
o
C Ham
a
no
Merge git://r
e
po
.
or
.
cz/gi
t
-g
u
i
commit
|
commitdiff
|
tree
2009-12-09
J
unio C
H
a
mano
Me
r
ge
g
i
t
:/
/
git
.
kernel
.
o
rg/pub/scm/g
i
t
k
/
gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
m
a
no
Upda
t
e draft releas
e
notes
t
o 1
.
6
.
6 before -rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
m
a
no
Merge branch
'
m
aint
'
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ha
m
an
o
Merge branch 'mm/maint-merge-
f
f-e
r
ror-message-
f
i
x
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
amano
M
e
rge branch '
j
n/maint-
p
ul
l
-rebase-error-me
s
sage' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C Hamano
M
erge branc
h
'
j
k/maint-add
-
p-delete-fix
'
into m
a
int
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Hamano
Merge git://git
.
bogomips
.
o
r
g
/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Jun
i
o C Hamano
Revert r
e
cent
"
git merg
e
<msg> HEAD <commi
t
>
.
.
.
" deprecation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
J
u
nio C Ha
m
an
o
Sync with 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Ju
n
io
C H
a
mano
Git 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Prepare for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge branch 'uk/maint-shortlog-encoding'
in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
M
e
rge branch 'fc
/
m
ai
n
t-fo
r
mat-patch-pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
Ha
m
ano
Merge branch 'ap/main
t
-
m
e
r
g
e-strategy-l
i
st-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C
Haman
o
Me
r
ge bra
n
ch 'jc
/
maint-
a
m-keep' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
r
g
e b
r
anch 'rs/work-ar
o
u
n
d-grep-opt-insanity' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge branch 'rj/m
a
int-cygwi
n
-count-object
s
'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge bran
c
h 'mm/maint-hint-fail
e
d-merge'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hama
n
o
Merge b
r
anch 'th/maint-remote-update-hel
p
-string' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
a
no
Me
r
g
e
branch 'rj/maint-t97
0
0' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
M
e
rge branch
'
ls/maint
-
mailinfo-no-inbody' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge branch 'mo/maint-c
r
lf-doc' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge branch 'th/remote-usage' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Me
r
ge
b
ran
c
h 'pb/mai
n
t
-
use-custom
-
p
erl' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
aman
o
Merge branch '
m
m/config-
p
athn
a
me-tilde-expand
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merge branch
'bc/grep-i-F' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge br
a
nch 'jk
/
maint-break-rena
m
e-re
d
u
ce-me
m
ory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
r
ge branch
'rj/mai
n
t-simpli
f
y
-cyg
w
in-makefil
e
' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C Hamano
Mer
g
e branch 'rg/doc-
w
orkflo
w
' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branc
h
'n
p
/
maint-sideband-
f
avor-status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
H
amano
Docume
n
tation: xmlto 0
.
0
.
18 does no
t
know
--stringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge in 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
G
i
t 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Uncond
i
tionally
s
et man
.
ba
s
e
.
u
r
l
.
for
.
re
l
ative
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Me
r
ge branch
'
maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Haman
o
Docu
m
entati
o
n/M
a
kefile: all
o
w man
.
base
.
url
.
for
.
relative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hama
n
o
Git 1
.
6
.
6-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hama
n
o
Merge b
r
anch
'maint'
commit
|
commitdiff
|
tree
2009-12-02
J
unio C Ha
m
a
n
o
Prepa
r
e for 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
J
unio C Hamano
merg
e
: d
o
n
o
t
add stan
d
a
rd message whe
n
message i
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C H
a
ma
n
o
Do not misidentify
"
gi
t
merge foo HEAD" as an old-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C H
a
mano
Up
d
a
te
draft release notes to 1
.
6
.
6
befo
r
e -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hama
n
o
Merge
b
ranch 'maint
'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merg
e
branch 'jc/deprecat
e
-old-synta
x
-from-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
git-m
e
rge:
a
deprecation notice of t
h
e ancient command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hama
n
o
Merge branch 'bw
/
r
e
mote-g
e
t
-ref
-
s
t
ates-fix'
commit
|
commitdiff
|
tree
2009-12-01
Junio C H
a
man
o
Merge branch 'jn/gitwe
b
-blame'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch
'
f
c/m
a
int-format-patch-p
a
thspec-dashe
s
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'mm/ma
i
nt-merge-f
f
-error-message-fi
x
'
commit
|
commitdiff
|
tree
2009-11-30
J
u
n
io C Hama
n
o
Merge branch 'a
p
/maint-merge-strateg
y
-
l
is
t
-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge
b
ranch 'jc/
p
retty-lf'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C
Hamano
Merge
branch 'cc/bisect-
d
oc'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hama
n
o
Merg
e
branch 'em
/
commit-claim'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Hamano
M
erge b
r
anch 'jc/mailinfo
-
re
m
ove-brackets'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C Hamano
Merge branch 'fc/send-emai
l
-envelope
'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
i
o
C Hamano
Merge branch 'uk
/
maint-shor
t
l
og-encoding'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge
b
r
anch 'ns/
s
end-emai
l
-no-chain-reply-to'
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
m
a
n
o
M
e
rge branch 'jc/m
a
int-am
-
keep'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge
branch '
b
w
/diff
-
c
o
lor-h
u
nk-header'
commit
|
commitdiff
|
tree
2009-11-28
J
u
nio C Haman
o
Update draft rel
e
a
s
e
note
s
to 1
.
6
.
6 before mergin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Jun
i
o
C
Hamano
emit_line(): don
'
t emit
an empty <SET><RESET
>
followed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
J
u
nio C Ha
m
ano
Re
m
o
v
e
d
e
ad code from
"
g
i
t am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
M
e
rge branch 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2009-11-27
Junio C Ham
a
no
bui
l
tin-apply
.
c
:
pay attention to -
p
<n> wh
e
n de
t
ermining
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Junio C
Hamano
Merge bra
n
ch 'rs/work
-
around-grep-opt-i
n
sanit
y
'
commit
|
commitdiff
|
tree
2009-11-24
Junio
C
Hamano
M
e
rge bra
n
ch 'rj/
m
aint-cygwin-cou
n
t
-
object
s
'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hama
n
o
Merge
b
ran
c
h 'rs/color-escape-has-zero-width'
commit
|
commitdiff
|
tree
2009-11-24
Junio
C
H
a
m
an
o
M
erge
b
r
anch '
b
g/apply-doc
'
commit
|
commitdiff
|
tree
2009-11-24
Jun
i
o C Ham
a
no
Merge branc
h
'
mm/maint
-
hint-failed-merge'
commit
|
commitdiff
|
tree
2009-11-24
Juni
o
C
Hamano
Me
r
ge
b
r
an
c
h 'jc/log-stdin'
commit
|
commitdiff
|
tree
2009-11-24
Ju
n
io C Hamano
Mer
g
e branch 'mr
/
g
i
tweb
-
s
napshot'
commit
|
commitdiff
|
tree
2009-11-24
Ju
n
io C
H
am
a
no
Merge branch
'
cc
/
rep
l
ace'
commit
|
commitdiff
|
tree
2009-11-24
Ju
n
i
o C Hamano
M
e
r
g
e
b
ra
n
ch '
m
a
int'
commit
|
commitdiff
|
tree
2009-11-24
Junio C
H
amano
Protect scr
i
pt
e
d Po
r
cela
i
ns from GR
E
P_OPTIONS
insanity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
A
d
d trivial tests for --stdi
n
option to log fami
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Ju
n
i
o C
Hamano
Merge branch 'bg/fetch
-
multi'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Gi
t
v1
.
6
.
6-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Junio C Ham
a
n
o
Merge bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merge g
i
t://git
.
bogomips
.
o
r
g/git-svn
commit
|
commitdiff
|
tree
2009-11-23
Junio C
Hamano
Merge bra
n
ch 'th/
m
aint-r
e
mote-update-hel
p
-
s
tring'
commit
|
commitdiff
|
tree
2009-11-23
Junio C
H
amano
M
e
r
g
e br
a
nch 'j
n
/faster-co
m
pletion-startup'
commit
|
commitdiff
|
tree
2009-11-23
Junio
C H
a
mano
Merge
b
ranch '
r
j/ma
i
nt-t9700'
commit
|
commitdiff
|
tree
2009-11-23
Juni
o
C
H
amano
M
e
rge br
a
n
c
h
'ls/maint-mailin
f
o
-
no-inbo
d
y'
commit
|
commitdiff
|
tree
next