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-one-file: force content conflict for "both sides added" case
2013-03-25
Juni
o
C Ham
a
no
merge-one-file: f
o
rce
c
onte
n
t co
n
flict for "both sid
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-25
Junio C
Hamano
merge-one-fi
l
e: remove stale com
m
e
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-09
Jun
i
o C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2013-03-08
Jun
i
o
C
H
amano
Merge git:
/
/git
.
b
o
gomips
.
or
g
/git-svn
commit
|
commitdiff
|
tree
2013-03-08
J
unio C Ha
m
ano
Update draft release
n
otes to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-07
J
unio C
H
amano
Gi
t
1
.
8
.
2-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-07
Junio C H
a
man
o
Merge
git://github
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2013-03-07
Junio C Hamano
Merge br
a
nch 'mp
/
c
o
mplete-paths'
commit
|
commitdiff
|
tree
2013-03-07
Ju
n
io C Hamano
Merge branch
'
ma
i
nt
'
commit
|
commitdiff
|
tree
2013-03-07
J
u
nio C Hama
n
o
Me
r
ge
branch 'mh/maint-
c
eil-
a
b
so
l
ut
e
' into
maint
commit
|
commitdiff
|
tree
2013-03-04
J
u
nio C
H
amano
Merge git://github
.
c
o
m
/git-l10n/git-po
commit
|
commitdiff
|
tree
2013-03-03
J
u
n
io C Hamano
Git 1
.
8
.
2-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-01
Junio C Hamano
Sync with 1
.
8
.
1
.
5
commit
|
commitdiff
|
tree
2013-03-01
Junio C Ham
a
no
G
i
t
1
.
8
.
1
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-01
Junio C
Ha
m
ano
Merge branch 'wk/us
e
r-m
a
nual' into maint
commit
|
commitdiff
|
tree
2013-02-27
J
u
nio
C
H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2013-02-27
J
u
nio C Hamano
Update draft releas
e
notes to
1
.
8
.
1
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-27
Junio C Hamano
M
erge branch 'e
f
/non-as
c
ii-parse-o
p
ti
o
ns-error-diag
.
.
.
commit
|
commitdiff
|
tree
2013-02-27
Junio C Hamano
Mer
g
e branch 'wk/man
-
deny-curren
t
-branch-is
-
default
.
.
.
commit
|
commitdiff
|
tree
2013-02-27
Jun
i
o
C
H
a
m
a
no
Merg
e
b
ranch '
j
n/less-reconfi
g
ure' into maint
commit
|
commitdiff
|
tree
2013-02-27
Junio
C
Ham
a
no
Merg
e
branch
'
m
h/maint-ceil-absolute'
commit
|
commitdiff
|
tree
2013-02-26
J
u
nio C
H
a
m
ano
Mer
g
e branch
'
fo
r
-junio' of git://g
i
thub
.
com
/
k
u
sma/git
commit
|
commitdiff
|
tree
2013-02-25
Junio C Ham
a
no
Git 1
.
8
.
2-
r
c1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-25
J
u
nio
C
Ha
m
a
n
o
M
erge
git://github
.
com/git
-
l1
0
n
/
git-po
commit
|
commitdiff
|
tree
2013-02-25
Juni
o
C
Hama
n
o
Syn
c
with 'mai
n
t'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-25
Junio C H
a
mano
Merge branch
'wk/user-m
a
nual'
commit
|
commitdiff
|
tree
2013-02-25
Junio C Ha
m
ano
Merg
e
bran
c
h 'jn/less-r
e
configu
r
e'
commit
|
commitdiff
|
tree
2013-02-25
Juni
o
C Hamano
Merge
b
ranch 'as/check-ignore'
commit
|
commitdiff
|
tree
2013-02-25
Junio C H
a
mano
Merge branch 'c
t
/auto
c
onf-htmldir'
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Mer
g
e bra
n
ch
'wk
/
man-deny-curr
e
nt-bran
c
h-is-defa
u
lt
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Prepare for 1
.
8
.
1
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-25
Junio C
H
amano
Merge branch 'jc/mention-tracking-for-pul
l
-
default
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Junio C Haman
o
Merge br
a
nc
h
'mm/config-intro-in-git-doc' into maint
commit
|
commitdiff
|
tree
2013-02-25
Junio C Ham
a
no
M
erge branch '
d
a/p4m
e
rge-mktem
p
-
f
ix
'
into main
t
commit
|
commitdiff
|
tree
2013-02-25
J
unio C Hamano
Merge bra
n
c
h
'bw/get-tz-off
s
e
t
-
p
e
r
l
'
i
nto maint
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Merge branch
'a
l
/mergetool-printf-fix' into
m
ai
n
t
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Me
r
ge
branch 'jx/utf8-printf-wi
d
th' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Merge
branch 'mg/
b
i
sec
t
-
d
oc' into ma
i
nt
commit
|
commitdiff
|
tree
2013-02-25
J
u
nio C Hamano
Merge b
r
an
c
h 'sp/s
m
art-http-conten
t
-type
-
check'
into
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Merge
b
ranc
h
'jc/com
b
ine-
d
iff-many-pa
r
ents' into main
t
commit
|
commitdiff
|
tree
2013-02-25
Juni
o
C H
a
mano
Mer
g
e
b
ranch 'jk/apply-similaritly-pars
i
ng' into ma
i
nt
commit
|
commitdiff
|
tree
2013-02-25
Junio C
Hamano
Merge branch 'jk/remote-helpers-doc'
i
nto maint
commit
|
commitdiff
|
tree
2013-02-25
J
u
nio C Hamano
Mer
g
e branch
'
ab/gitweb-use-
s
ame-sc
h
eme'
into maint
commit
|
commitdiff
|
tree
2013-02-25
Junio C
H
amano
M
e
rge bra
n
ch 'zk/cle
a
n-repor
t
-failure' into ma
i
n
t
commit
|
commitdiff
|
tree
2013-02-25
J
u
n
i
o
C
Hamano
Merge br
a
nch 'nd/clon
e
-no-separate-git-dir
-
with
-
bare
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Junio C Ham
a
n
o
Merge bran
c
h 'da/p
4
m
e
rge-mk
t
emp'
into maint
commit
|
commitdiff
|
tree
2013-02-20
Jun
i
o
C Ha
m
ano
Sy
n
c
w
ith v1
.
8
.
1
.
4
commit
|
commitdiff
|
tree
2013-02-20
Junio
C
H
a
mano
G
i
t
1
.
8
.
1
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-20
Juni
o
C Hamano
Merge branch
'
ob/i
m
ap-send-ssl-
v
e
r
ify' into
maint
commit
|
commitdiff
|
tree
2013-02-19
Junio C Haman
o
name-h
a
sh: allow has
h
ing an empty
str
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-19
J
u
n
io
C Ham
a
n
o
imap-send: m
o
ve #ifd
e
f around
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-19
J
uni
o
C H
a
m
a
no
Merg
e
branc
h
'jc/
m
ention-trac
k
ing-for-pull-default'
commit
|
commitdiff
|
tree
2013-02-19
Jun
i
o C Haman
o
M
e
r
g
e bran
c
h 'mm/config-intr
o
-in-git-doc'
commit
|
commitdiff
|
tree
2013-02-18
Jun
i
o C Hamano
RelNot
e
s 1
.
8
.
2: p
u
s
h-simpl
e
wi
l
l not be in e
f
fe
c
t in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-18
J
u
nio C Ha
m
ano
user-m
a
nual: ty
p
o
f
ix (ofth
e
->
o
f the)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-18
Junio
C
H
amano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2013-02-18
Junio
C
H
am
a
no
Merge git://g
i
thub
.
c
o
m/git-l10n/git-po
commit
|
commitdiff
|
tree
2013-02-17
Junio C Hamano
Git
1
.
8
.
2
-
rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-17
Junio
C
Haman
o
M
er
g
e branch 'jc/hidden-r
e
fs'
commit
|
commitdiff
|
tree
2013-02-17
Ju
n
io C Hamano
Merge branch 'm
p
/
diff-algo-config'
commit
|
commitdiff
|
tree
2013-02-17
Jun
i
o C Hamano
Merge branch 'mw/bash-prompt-show-untracked
-
config'
commit
|
commitdiff
|
tree
2013-02-17
Junio C Ha
m
a
n
o
Me
r
ge
branch '
j
k/re
b
ase-i
-
co
m
ment-char'
commit
|
commitdiff
|
tree
2013-02-17
Juni
o
C Hamano
Merge
b
ranch 'j
k
/r
e
ad-commit-
b
uffer-
d
ata-afte
r
-free'
commit
|
commitdiff
|
tree
2013-02-15
Jun
i
o C
H
am
a
no
Update draft release notes to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-15
J
u
nio C Hamano
M
e
rge
br
a
nch 'wk/man-deny-current-branch-i
s
-default
.
.
.
commit
|
commitdiff
|
tree
2013-02-15
Junio C H
a
ma
n
o
Merge b
r
anc
h
'mk/
m
ake-rm
-
depdirs-could-
b
e-empty
'
commit
|
commitdiff
|
tree
2013-02-15
Junio
C
Hama
n
o
Mer
g
e branch '
m
m/config-loc
a
l-completion'
commit
|
commitdiff
|
tree
2013-02-15
Junio C Hama
n
o
Merge
b
ranch 'ef/non-
a
scii-parse-option
s
-err
o
r-diag'
commit
|
commitdiff
|
tree
2013-02-15
Junio C H
a
mano
Merge branch
'mk/old-expat'
commit
|
commitdiff
|
tree
2013-02-15
Junio C
H
a
m
ano
M
erge branch
'
d
a
/p4merge-mk
t
emp-fix'
commit
|
commitdiff
|
tree
2013-02-14
Juni
o
C Hamano
Documentatio
n
/git-add:
kill rema
i
ning
<file
p
a
t
tern>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-14
Junio C Hamano
Updat
e
draft release no
t
e
s to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-14
Junio C Haman
o
Merge branch 'jk/diff-g
r
aph-cl
e
a
nup'
commit
|
commitdiff
|
tree
2013-02-14
Jun
i
o C Hamano
Merge branch 'nd/statu
s
-show-in-progress
'
commit
|
commitdiff
|
tree
2013-02-14
J
uni
o
C
H
amano
M
e
r
g
e bra
n
ch
'mm/remo
t
e-mediawi
k
i-
b
u
i
l
d'
commit
|
commitdiff
|
tree
2013-02-14
Juni
o
C Hamano
Merge bran
c
h '
b
w/g
e
t-tz-offse
t
-perl
'
commit
|
commitdiff
|
tree
2013-02-14
Junio
C
Haman
o
Merge
bran
c
h '
a
l/
m
ergetool-pri
n
tf-
f
ix'
commit
|
commitdiff
|
tree
2013-02-14
J
unio C Hamano
Merge b
r
anch '
j
k/error
-
cons
t
-re
t
urn'
commit
|
commitdiff
|
tree
2013-02-14
J
unio C
Hama
n
o
Mer
g
e branch
'jx
/
u
tf8-pri
n
tf-w
i
dth'
commit
|
commitdiff
|
tree
2013-02-14
Jun
i
o
C Hamano
Merge b
r
anch
'
mg/b
i
sect-doc'
commit
|
commitdiff
|
tree
2013-02-14
Ju
n
io C
H
aman
o
Merge branch 'tz/perl-styles'
commit
|
commitdiff
|
tree
2013-02-14
Junio C Ha
m
ano
Me
r
ge branch
'jc/extended-fak
e
-ancestor-for-gitli
n
k'
commit
|
commitdiff
|
tree
2013-02-14
Junio
C
Hamano
Merge branc
h
'dg/subtr
e
e-fixes'
commit
|
commitdiff
|
tree
2013-02-12
Jun
i
o C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2013-02-11
Junio
C
Hamano
U
p
date draft releas
e
no
t
es to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-11
Jun
i
o C Hamano
Merge br
a
nch 'maint
'
commit
|
commitdiff
|
tree
2013-02-11
Junio C Ham
a
no
Merge branch 'sp/smart-htt
p
-content-typ
e
-check'
commit
|
commitdiff
|
tree
2013-02-09
Junio C Haman
o
M
erge
b
r
anch
'
master' of gi
t
:
/
/githu
b
.
com
/
gi
t
-l10
n
.
.
.
commit
|
commitdiff
|
tree
2013-02-08
Ju
n
io C Hama
n
o
Me
r
g
e
branc
h
'jc/co
m
bine-diff-ma
n
y-pa
r
ents'
commit
|
commitdiff
|
tree
2013-02-08
Junio C Hamano
M
e
r
ge branch 'j
k
/appl
y
-similaritly-parsing
'
commit
|
commitdiff
|
tree
2013-02-08
Junio C Ha
m
ano
M
erge b
r
anch 'mk/t
c
sh-complete-only-
k
now
n
-paths'
commit
|
commitdiff
|
tree
2013-02-08
Junio
C Hamano
Merge branch 'mp/comp
l
ete-paths'
commit
|
commitdiff
|
tree
2013-02-08
Junio
C
Haman
o
Merge bra
n
ch 'ct/autoco
n
f-
h
t
mldir'
commit
|
commitdiff
|
tree
2013-02-07
Jun
i
o C Ha
m
ano
Updat
e
draft rel
e
ase notes
t
o
1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-07
J
u
nio C
Ha
m
a
n
o
Sync
with
1
.
8
.
1
.
3
commit
|
commitdiff
|
tree
2013-02-07
J
unio C Hamano
Gi
t
1
.
8
.
1
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-07
Junio C Hamano
M
e
r
g
e bra
n
ch 'mz/pick
-
unbo
r
n' into
maint
commit
|
commitdiff
|
tree
2013-02-07
Juni
o
C Hamano
M
e
r
g
e branc
h
'nd/fix-pe
r
f-parameters-in-te
s
ts' into
.
.
.
commit
|
commitdiff
|
tree
2013-02-07
J
u
n
io C Hamano
Merge br
a
nch 'jc/do-n
o
t-let-random-file
-
interfere-with
.
.
.
commit
|
commitdiff
|
tree
2013-02-07
Junio
C Hamano
Merge
branch 'ft/transport-report-segv' i
n
to m
a
int
commit
|
commitdiff
|
tree
next