repo.or.cz
/
git
/
mingw.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'
2009-12-30
J
unio
C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-30
Junio C Hamano
M
e
rge bra
n
ch 'maint-1
.
6
.
1'
i
nto
maint
commit
|
commitdiff
|
tree
2009-12-30
Junio
C
H
amano
Merge
b
r
anch 'maint-1
.
6
.
0' in
t
o maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-28
J
un
i
o C Hamano
Me
r
ge branch 'jk/1
.
7
.
0-status'
commit
|
commitdiff
|
tree
2009-12-28
Junio C H
a
ma
n
o
Merge bra
n
ch
'maint'
commit
|
commitdiff
|
tree
2009-12-27
J
unio C
Hamano
Merg
e
branch 'nf/ma
i
nt-f
i
x-index-
e
x
t
-len-on-
b
e64' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-26
J
unio C Ha
m
ano
Merge branch
'maint
'
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ha
m
ano
Makefile
:
FreeBSD (both 7 and
8
) needs OLD_
I
CONV
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Haman
o
S
t
a
r
t 1
.
6
.
6
.
X maintenance tra
c
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C Ham
a
no
Merge
b
ra
n
c
h 'jc/m
a
int-obsd46
'
into
maint
commit
|
commitdiff
|
tree
2009-12-26
J
u
ni
o
C Hamano
K
ick off 1
.
7
.
0 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
unio C Hama
n
o
Merge branch 'gb/1
.
7
.
0-diff-whi
t
espace-only-o
u
tput'
commit
|
commitdiff
|
tree
2009-12-26
Junio
C Haman
o
Merge
branch
'jc
/
1
.
7
.
0-diff-whitesp
a
ce-only-status'
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
Merge
b
r
anch
'jc/1
.
7
.
0-push
-
safet
y
'
commit
|
commitdiff
|
tree
2009-12-26
Junio
C H
a
mano
Merge
branch 'jc/1
.
7
.
0
-send-email-no-th
r
ead-default'
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ham
a
no
Merge branch 'sr/vcs-helper'
commit
|
commitdiff
|
tree
2009-12-26
J
uni
o
C Hamano
t4019 "grep" por
t
abilit
y
f
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ham
a
n
o
t1200: work aroun
d
a bug in some implementations of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Junio C Hamano
G
i
t
1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Ju
n
i
o C Haman
o
Merge
branc
h
'maint'
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
Junio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-16
Ju
n
io C Ham
a
n
o
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
branch 'maint' to
sync 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
H
a
mano
wo
r
ktree: don't seg
f
ault with
a
n absolute pathspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
J
u
nio C H
a
mano
statu
s
/commit: do
not s
u
ggest "reset
H
EAD <path>" while
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
J
unio C
Hamano
commit
/
st
a
tus:
"git add <path>" is not nece
s
sarily
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Junio C Hama
n
o
comm
i
t/s
t
atu
s
: ch
e
c
k
$GIT_DIR/MERGE
_
H
EAD
o
n
l
y once
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
Update Release
N
otes
f
o
r
1
.
6
.
6 to
r
em
o
v
e ol
d
bugfixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio
C
Haman
o
S
y
nc
w
ith 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C
H
a
m
a
no
Git 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Ha
m
ano
F
i
x a
r
c
h
ive format with -- on the command lin
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Ha
m
a
no
R
e
move post-upload-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Jun
i
o C Hamano
Git 1
.
6
.
6
-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Ham
a
no
Merge git://r
e
po
.
or
.
c
z/g
i
t-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Hamano
M
erge git://git
.
kernel
.
or
g
/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Hamano
U
p
d
a
t
e draft release notes to 1
.
6
.
6 bef
o
re
-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C H
a
mano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Haman
o
Merg
e
branch 'mm/maint-merge-ff-er
r
or-m
e
ssage-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ham
a
no
Merge
bra
n
ch 'jn/maint-pull-rebase-erro
r
-me
s
sage'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ha
m
ano
Merg
e
branch
'
jk/maint
-
add-p-delete-fix
'
into
m
ain
t
commit
|
commitdiff
|
tree
2009-12-09
J
un
i
o C Hamano
Merge git://
g
it
.
bogomips
.
o
r
g/git
-
s
vn
commit
|
commitdiff
|
tree
2009-12-08
Junio C
Hamano
Revert recent "gi
t
merge
<msg> HEAD
<
c
o
mmi
t
>
.
.
.
" deprecat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Juni
o
C
Hamano
Sync wi
t
h 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
Hamano
M
erge
bran
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
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
Mer
g
e branch 'u
k
/maint-shortlog-encoding' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Mer
g
e branch 'fc/main
t
-format-patch-pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Mer
g
e br
a
nch 'ap/maint-merge-strat
e
gy-list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Mer
g
e branch 'jc
/
maint-am-keep'
i
n
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C Hamano
Me
r
ge
b
ranch
'rs/work-around-g
r
ep-opt-i
n
sanity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge branch
'rj/maint
-
cygwin-count-obj
e
cts' into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o C Hamano
Merge branch 'mm/main
t
-hi
n
t-failed-merge' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Mer
g
e
bra
n
ch
'
th/m
a
i
nt-remote-update-help-s
t
ri
n
g' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C
Hamano
M
erge branch 'rj/maint-t9700' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Merge branch 'ls/maint-ma
i
linfo-no-i
n
body' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge
br
a
n
c
h 'm
o
/
m
aint
-
crlf-d
o
c' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge b
r
an
c
h 'th/remote
-
usage' into
ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C H
a
mano
Merge branc
h
'
p
b/maint-use-cu
s
tom-per
l
' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Me
r
ge
branch 'mm/config-pathname-tilde-expan
d
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge br
a
nch 'bc/grep-i-F'
i
n
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
M
erge branch 'jk/maint-b
r
eak-re
n
ame-reduce-memory
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erge bran
c
h 'rj/m
a
int-simplif
y
-cy
g
win-ma
k
efile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge br
a
nch 'rg/doc-workflow
'
into
main
t
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o C Hamano
Merge
branch 'n
p
/maint-sideband
-
favo
r
-status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
m
a
n
o
D
ocument
a
tion: xml
t
o 0
.
0
.
18 does not know
--string
p
a
ra
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Ha
m
ano
Merge in 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
G
it 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Unconditi
o
nally
s
et man
.
base
.
u
r
l
.
for
.
relative
.
link
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Documentation/Ma
k
efile: allow
m
an
.
b
a
s
e
.
url
.
for
.
re
l
ative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Git
1
.
6
.
6-
r
c1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C
Ham
a
no
Merge branch
'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C H
a
ma
n
o
Pr
e
p
a
re 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 no
t
add
s
tandard message when message is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ham
a
no
Do not mi
s
id
e
ntif
y
"git merge foo HE
A
D" as an
o
ld-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
Hamano
Update draft r
e
l
e
ase notes to 1
.
6
.
6 before -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Juni
o
C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io C Hamano
Merge branch 'jc/deprecate-o
l
d-syntax-from-
m
erge'
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
Hamano
git-merge
:
a dep
r
ecation n
o
tice of the ancient command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hama
n
o
Me
r
ge branch '
b
w
/
remote-get-
r
e
f-states-fix'
commit
|
commitdiff
|
tree
2009-12-01
Junio C H
a
m
ano
M
erg
e
b
ranch 'jn/gitweb
-
b
l
ame'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ham
a
no
Merge bran
c
h 'fc/maint-format
-
patch-
p
athspec-dashes'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branc
h
'mm/ma
i
nt-merge-ff-error-message
-
f
ix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
m
a
no
Merge branch 'ap/maint-merg
e
-strategy-list-
f
ix'
commit
|
commitdiff
|
tree
2009-11-30
J
u
ni
o
C Hamano
Merge b
r
anch
'
jc/pretty-lf'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Mer
g
e bra
n
ch 'cc/bisect-doc'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C
H
amano
M
erge branch
'em/c
o
mmit-claim
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ha
m
ano
Merge branch '
j
c
/
mailinfo-remove-brackets'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'fc/send-email-
e
nvelope'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
amano
Merg
e
branc
h
'uk/maint-shortlog
-
encoding'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C
Hamano
Merge bran
c
h 'ns/se
n
d
-email-no-chain-r
e
p
l
y
-to'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
am
a
n
o
Merge branc
h
'jc/maint-
a
m-keep'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merg
e
branch
'
bw/di
f
f-
c
o
l
or-h
u
nk-header'
commit
|
commitdiff
|
tree
2009-11-28
J
unio
C
Hamano
U
pdate draft
release
n
otes to 1
.
6
.
6 b
e
fore merging
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Junio
C
H
amano
emi
t
_line()
:
don't emit an emp
t
y <SET>
<
RESET> fol
l
owed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
J
u
nio C Hamano
Remove dead
c
o
de
f
r
o
m "git am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
Merge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
next