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
merge-one-file: force content conflict for "both sides added" case
2013-03-25
Junio C
H
aman
o
merg
e
-one-file: force c
o
ntent con
f
lic
t
for "both sides
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-25
Juni
o
C Hamano
me
r
ge-one-file: re
m
ove stale co
m
ment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-09
J
u
nio C Hamano
Merge b
r
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2013-03-08
Jun
i
o C
Hamano
Merge git://git
.
bogo
m
ips
.
o
rg/
g
it-svn
commit
|
commitdiff
|
tree
2013-03-08
Jun
i
o C Hamano
Update dra
f
t release note
s
to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-07
Junio C Haman
o
Git 1
.
8
.
2-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-07
J
u
nio C Ha
m
ano
Merge git://github
.
co
m
/git-l10n/git-po
commit
|
commitdiff
|
tree
2013-03-07
Juni
o
C
H
a
m
an
o
Merge br
a
nc
h
'mp/complete-pat
h
s'
commit
|
commitdiff
|
tree
2013-03-07
Ju
n
io
C
Ha
m
a
no
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2013-03-07
J
unio C Hamano
M
erge
branc
h
'mh/maint-ceil-ab
s
ol
u
te' into maint
commit
|
commitdiff
|
tree
2013-03-04
Juni
o
C
H
a
mano
Merge
g
i
t:
/
/github
.
com/
g
i
t
-l10n/
g
it-po
commit
|
commitdiff
|
tree
2013-03-03
J
u
n
io C
H
amano
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
Ju
n
io C Hamano
Git 1
.
8
.
1
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-01
Junio
C Hamano
Merge
bra
n
ch '
w
k/user-
m
anual' into maint
commit
|
commitdiff
|
tree
2013-02-27
Jun
i
o
C
Hamano
Me
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2013-02-27
Junio C
Hamano
Update draft release
n
otes to 1
.
8
.
1
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-27
Juni
o
C Hamano
Merge branch '
e
f/non-ascii-parse-opt
i
o
ns-error-diag
.
.
.
commit
|
commitdiff
|
tree
2013-02-27
Junio
C Hamano
Merge bra
n
ch 'wk/man-d
e
ny-curren
t
-branch-is-defaul
t
.
.
.
commit
|
commitdiff
|
tree
2013-02-27
J
un
i
o
C Hamano
M
e
rge branch '
j
n
/
less-reconfigure' into m
a
int
commit
|
commitdiff
|
tree
2013-02-27
Junio C Hama
n
o
Merge br
a
n
ch 'm
h
/maint-ceil-ab
s
olute
'
commit
|
commitdiff
|
tree
2013-02-26
J
unio C Hamano
Merge bran
c
h
'
f
or-junio' of gi
t
://gi
t
hub
.
com/kusma/git
commit
|
commitdiff
|
tree
2013-02-25
J
unio C Hamano
Gi
t
1
.
8
.
2
-
rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-25
J
u
nio C Hamano
Me
r
g
e git://github
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2013-02-25
Junio C Ham
a
no
Sync with 'maint'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-25
J
unio C Haman
o
Mer
g
e br
a
nch 'wk/user-manual'
commit
|
commitdiff
|
tree
2013-02-25
J
u
nio C Haman
o
Merge br
a
nch 'jn/less
-
reconfigure'
commit
|
commitdiff
|
tree
2013-02-25
J
u
ni
o
C Hamano
Merge br
a
nch 'as/ch
e
ck-ig
n
ore'
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Merge branch 'ct/aut
o
conf-htmldir'
commit
|
commitdiff
|
tree
2013-02-25
J
u
nio C Hamano
Merge bran
c
h
'wk/man-de
n
y-cur
r
ent-branch-is-defau
l
t
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Juni
o
C Hamano
Prep
a
re
f
or 1
.
8
.
1
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-25
J
unio C
H
ama
n
o
Mer
g
e branch 'jc/
m
entio
n
-tra
c
king-for-pull
-
default
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Junio C H
a
man
o
Mer
g
e
bran
c
h
'
mm/config
-
intro-in-git-doc
'
into maint
commit
|
commitdiff
|
tree
2013-02-25
Jun
i
o
C Hamano
Me
r
ge bra
n
c
h
'da/p4
m
erge-mktemp-fix' int
o
maint
commit
|
commitdiff
|
tree
2013-02-25
J
unio C Hamano
Merg
e
branch '
b
w/get-tz-of
f
set-perl' into ma
i
nt
commit
|
commitdiff
|
tree
2013-02-25
Junio C Haman
o
M
erge
b
ranch
'
al/mergetool-printf-fix
'
into
m
aint
commit
|
commitdiff
|
tree
2013-02-25
J
u
n
i
o C Hamano
Merg
e
branch 'jx/
u
tf8-printf-w
i
dth' into maint
commit
|
commitdiff
|
tree
2013-02-25
Ju
n
io C Hamano
M
erge branch 'mg/bisec
t
-d
o
c' into main
t
commit
|
commitdiff
|
tree
2013-02-25
J
un
i
o C H
a
m
ano
Merge branch 'sp/smart-http-conten
t
-ty
p
e-ch
e
ck' into
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Junio
C Ham
a
no
Me
r
ge b
r
a
n
ch 'jc/combine
-
d
i
f
f
-
many-parents' into maint
commit
|
commitdiff
|
tree
2013-02-25
Junio C Ha
m
an
o
Merge b
r
anch 'jk/apply-simil
a
ritly-parsin
g
' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2013-02-25
Junio C H
a
mano
M
er
g
e branc
h
'jk/r
e
mote-h
e
lpers-
d
oc' int
o
maint
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Merge branch 'ab/gi
t
web-u
s
e-same-scheme' into
maint
commit
|
commitdiff
|
tree
2013-02-25
Junio
C
Hamano
Me
r
ge branc
h
'zk/clean-report-f
a
ilure' into maint
commit
|
commitdiff
|
tree
2013-02-25
J
u
nio C Ha
m
a
no
Merge branch 'nd/clone-no-separate-git-
d
ir-with-bare
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
J
unio C
H
a
mano
Merge branch '
d
a/p4merge-mktemp' into m
a
int
commit
|
commitdiff
|
tree
2013-02-20
Junio C
H
amano
Sync with v1
.
8
.
1
.
4
commit
|
commitdiff
|
tree
2013-02-20
Juni
o
C
Ha
m
a
no
Git 1
.
8
.
1
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-20
Junio C Hamano
Merge branch
'
ob/ima
p
-send-ssl-verify' in
t
o maint
commit
|
commitdiff
|
tree
2013-02-19
Junio C Hamano
name-
h
ash: allow
h
ashing an empty string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-19
Ju
n
io
C
Hamano
imap-s
e
nd: move
#
ifdef
around
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-19
Junio
C
Ham
a
no
Merge branch
'jc/mention-tracking-for-pull-default
'
commit
|
commitdiff
|
tree
2013-02-19
J
u
nio C Hamano
M
e
r
ge branch 'mm/confi
g
-intro-in-git-
d
oc'
commit
|
commitdiff
|
tree
2013-02-18
Junio C Hamano
R
e
lNotes
1
.
8
.
2: push-si
m
ple
w
il
l
not
b
e
in e
f
fect in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-18
J
u
nio C Haman
o
user-manual: typofix (o
f
the->of the)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-18
Junio C Ham
a
n
o
Me
r
ge branch 'm
a
int'
commit
|
commitdiff
|
tree
2013-02-18
Junio C
H
amano
Me
r
g
e gi
t
://git
h
ub
.
co
m
/gi
t
-l10n
/
git-po
commit
|
commitdiff
|
tree
2013-02-17
J
u
nio C Hama
n
o
Git
1
.
8
.
2-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-17
Junio C Hamano
Me
r
ge
b
ranch 'jc/h
i
dden-re
f
s'
commit
|
commitdiff
|
tree
2013-02-17
Junio C
H
a
mano
Merge branch 'mp/di
f
f-algo-config'
commit
|
commitdiff
|
tree
2013-02-17
Junio C Haman
o
Merge
b
ra
n
ch 'mw/bas
h
-
prompt-show-untra
c
ke
d
-co
n
f
ig'
commit
|
commitdiff
|
tree
2013-02-17
Junio C Hamano
M
erge branch '
j
k
/
r
e
ba
s
e
-
i-c
o
mment-
c
har'
commit
|
commitdiff
|
tree
2013-02-17
J
u
ni
o
C Hamano
Merge
branc
h
'jk/read-commit-
b
uffer-data-afte
r
-free'
commit
|
commitdiff
|
tree
2013-02-15
Ju
n
io
C Hamano
Update draft release
notes
to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-15
Junio C Hamano
Merge br
a
nc
h
'wk/man
-
d
eny-current-bra
n
c
h
-is-default
.
.
.
commit
|
commitdiff
|
tree
2013-02-15
Junio C H
a
mano
Me
r
g
e branch
'
m
k/make-rm-d
e
pdirs-could-be-emp
t
y'
commit
|
commitdiff
|
tree
2013-02-15
Ju
n
io C Hamano
M
er
g
e branch
'mm/co
n
fig-local-completion'
commit
|
commitdiff
|
tree
2013-02-15
J
u
n
i
o
C H
a
mano
Me
r
g
e branch 'e
f
/non
-
as
c
ii-
p
arse-options-er
r
o
r
-diag
'
commit
|
commitdiff
|
tree
2013-02-15
Junio C Hamano
Merge bran
c
h 'mk/ol
d
-ex
p
at'
commit
|
commitdiff
|
tree
2013-02-15
Junio C Hamano
Mer
g
e br
a
nch '
d
a/p4merge
-
mk
t
emp-fix'
commit
|
commitdiff
|
tree
2013-02-14
Ju
n
io C Haman
o
Docum
e
ntation/g
i
t-add: kill rem
a
ini
n
g <filepatter
n
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-14
Junio
C Ha
m
ano
Updat
e
dr
a
f
t
r
el
e
ase notes to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-14
Jun
i
o C Ha
m
ano
Merge
branch 'jk/diff-g
r
aph-cle
a
nup'
commit
|
commitdiff
|
tree
2013-02-14
J
unio C H
a
man
o
M
erge branch 'nd/s
t
a
t
us-show-in-pro
g
r
e
ss'
commit
|
commitdiff
|
tree
2013-02-14
Jun
i
o
C
H
a
mano
Merge branch '
m
m/remo
t
e
-
m
ediawiki-bu
i
ld'
commit
|
commitdiff
|
tree
2013-02-14
Junio C H
a
mano
M
erge branch 'bw/get-tz-offset-perl'
commit
|
commitdiff
|
tree
2013-02-14
Junio C Hamano
M
e
rge branch 'al/mergetool-printf-fix'
commit
|
commitdiff
|
tree
2013-02-14
J
uni
o
C H
a
mano
Merge branch
'
jk/e
r
ror
-
const
-
return'
commit
|
commitdiff
|
tree
2013-02-14
Junio
C
H
a
mano
Merge bran
c
h 'j
x
/utf8-printf-wid
t
h'
commit
|
commitdiff
|
tree
2013-02-14
Junio
C
Ha
m
ano
Merge branch 'mg
/
bisect-doc'
commit
|
commitdiff
|
tree
2013-02-14
J
u
n
i
o C
H
a
mano
Merge bran
c
h
'tz/perl-styles'
commit
|
commitdiff
|
tree
2013-02-14
Junio
C Hamano
Merge b
r
a
n
ch 'jc/extended-fake-ancestor
-
for-gitlink'
commit
|
commitdiff
|
tree
2013-02-14
Junio C Ham
a
no
Merge branch
'
dg/subtree-fixes'
commit
|
commitdiff
|
tree
2013-02-12
J
unio C Ham
a
no
M
e
rge bra
n
ch 'maint
'
commit
|
commitdiff
|
tree
2013-02-11
Juni
o
C Hama
n
o
Update draft r
e
lease notes to
1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-11
Junio C Ha
m
an
o
Merge b
r
anc
h
'm
a
int'
commit
|
commitdiff
|
tree
2013-02-11
Ju
n
io C Hamano
Merg
e
bra
n
ch 'sp/smart-http
-
content-t
y
p
e
-check'
commit
|
commitdiff
|
tree
2013-02-09
Junio C Hamano
Merge branch 'maste
r
'
of git://github
.
c
om/gi
t
-
l1
0
n
.
.
.
commit
|
commitdiff
|
tree
2013-02-08
Juni
o
C
Hamano
Merge bra
n
c
h
'jc/combine-diff-many-parents'
commit
|
commitdiff
|
tree
2013-02-08
Jun
i
o C Hamano
Merge
branch 'j
k
/apply-si
m
ilaritl
y
-
pars
i
ng'
commit
|
commitdiff
|
tree
2013-02-08
Junio C
Hamano
Merge bran
c
h 'mk/tcsh
-
co
m
plete-only
-
kn
o
wn-paths'
commit
|
commitdiff
|
tree
2013-02-08
J
unio C
H
amano
M
e
rge branch 'mp/c
o
mplete-paths
'
commit
|
commitdiff
|
tree
2013-02-08
J
u
nio C Hamano
M
erge branch 'ct/autoc
o
nf-
h
tm
l
dir'
commit
|
commitdiff
|
tree
2013-02-07
Junio C Hamano
Update draft
r
e
l
ease
n
o
t
es to
1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-07
Junio
C
Hamano
Sync with 1
.
8
.
1
.
3
commit
|
commitdiff
|
tree
2013-02-07
Juni
o
C H
a
mano
Git 1
.
8
.
1
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-07
Jun
i
o C H
a
mano
Merg
e
branc
h
'mz/pick-unb
o
rn' into mai
n
t
commit
|
commitdiff
|
tree
2013-02-07
Junio C Hamano
Merge bran
c
h 'nd/fix-perf-parame
t
ers-in-tests' into
.
.
.
commit
|
commitdiff
|
tree
2013-02-07
Ju
n
i
o
C Hamano
Merge
b
ran
c
h
'j
c
/do
-
not
-
let-ra
n
do
m
-file-inte
r
fere-wit
h
.
.
.
commit
|
commitdiff
|
tree
2013-02-07
Junio C Hama
n
o
M
erge branch 'ft
/
transport-
r
eport-segv' i
n
t
o ma
i
n
t
commit
|
commitdiff
|
tree
next