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 Hamano
merge-one-file: fo
r
ce content confli
c
t for "both s
i
d
es
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-25
Junio C Hamano
m
e
r
ge-one-
f
i
le:
r
e
move stale comment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-09
Junio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2013-03-08
Juni
o
C Hamano
Merge gi
t
:
/
/
git
.
b
o
gomips
.
or
g
/git-svn
commit
|
commitdiff
|
tree
2013-03-08
Junio
C Hamano
Update
d
r
aft releas
e
no
t
es
t
o 1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-07
Junio
C Hamano
Git 1
.
8
.
2-
r
c3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-07
Ju
n
io
C
Haman
o
Merge git://gith
u
b
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2013-03-07
J
u
nio C Ham
a
no
M
erge branch 'mp/
c
omplete-paths
'
commit
|
commitdiff
|
tree
2013-03-07
Junio C Hamano
Mer
g
e branch
'main
t
'
commit
|
commitdiff
|
tree
2013-03-07
Junio C Hamano
Mer
g
e b
r
an
c
h
'
mh/
m
aint-ceil-absolute' into maint
commit
|
commitdiff
|
tree
2013-03-04
J
unio
C
Hamano
Merge git://github
.
com/
g
i
t-l10n/
g
i
t-po
commit
|
commitdiff
|
tree
2013-03-03
Junio C
H
amano
Git 1
.
8
.
2-
r
c2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-01
Juni
o
C Hamano
Sy
n
c with 1
.
8
.
1
.
5
commit
|
commitdiff
|
tree
2013-03-01
Junio C Hamano
Git 1
.
8
.
1
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-01
Jun
i
o
C Hama
n
o
Me
r
ge branch
'
wk/user-manua
l
' into maint
commit
|
commitdiff
|
tree
2013-02-27
Junio C
Hamano
M
e
rge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2013-02-27
Junio
C
Hamano
Update
draft re
l
ease note
s
t
o
1
.
8
.
1
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-27
Junio C Hamano
Me
r
ge branch
'
e
f
/non-ascii-parse-opt
i
o
n
s
-
error-diag
.
.
.
commit
|
commitdiff
|
tree
2013-02-27
Junio
C
Hamano
Mer
g
e branch
'w
k
/m
a
n-deny-curre
n
t-branch
-
i
s
-
default
.
.
.
commit
|
commitdiff
|
tree
2013-02-27
Junio C Hamano
M
e
rge bra
n
c
h 'j
n
/less-reconfigu
r
e' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2013-02-27
Junio C Hamano
Mer
g
e
b
ranch 'mh/maint-ce
i
l-absolute'
commit
|
commitdiff
|
tree
2013-02-26
Junio C
H
am
a
no
Merge branch 'for-
j
u
ni
o
' of gi
t
://github
.
com/kusma
/
git
commit
|
commitdiff
|
tree
2013-02-25
Ju
n
io C Hamano
Git 1
.
8
.
2-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Merg
e
git://github
.
com/git-
l
10
n
/git-po
commit
|
commitdiff
|
tree
2013-02-25
J
unio C Hamano
Sync
w
ith 'm
a
int'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-25
Junio C
H
am
a
no
Merg
e
branch 'w
k
/user-manual
'
commit
|
commitdiff
|
tree
2013-02-25
J
u
n
io C Ham
a
no
M
e
rge
b
ranch 'jn/less-reconfigure'
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Mer
g
e branch 'as/che
c
k-i
g
nore'
commit
|
commitdiff
|
tree
2013-02-25
Ju
n
io
C
Haman
o
M
e
r
ge br
a
nch 'ct/autoconf-htm
l
dir'
commit
|
commitdiff
|
tree
2013-02-25
Junio C
H
a
ma
n
o
M
erge branch 'wk/man-deny-current-bran
c
h-is-defau
l
t
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Juni
o
C Ham
a
no
Prepare for 1
.
8
.
1
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-25
Junio C H
a
ma
n
o
Merge
branch
'
j
c/mention-tr
a
c
king-f
o
r-pull-defaul
t
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hama
n
o
Merge
b
ranch 'mm/config-intro-i
n
-
git-doc' int
o
m
aint
commit
|
commitdiff
|
tree
2013-02-25
J
unio C
H
amano
Merge
branch 'da/
p
4merge-mkt
e
mp-fix' into maint
commit
|
commitdiff
|
tree
2013-02-25
Juni
o
C
Ha
m
ano
Merge branch 'bw
/
get-tz-offset-
p
erl' int
o
maint
commit
|
commitdiff
|
tree
2013-02-25
Junio
C Haman
o
Merge bra
n
ch
'
al/mergetool-printf-fi
x
' into main
t
commit
|
commitdiff
|
tree
2013-02-25
Junio
C
Hamano
Merge branch 'jx/utf8-pri
n
tf-width' into maint
commit
|
commitdiff
|
tree
2013-02-25
J
un
i
o C Ha
m
an
o
Merge
b
ranch
'
mg/bise
c
t-doc' into mai
n
t
commit
|
commitdiff
|
tree
2013-02-25
Ju
n
io
C
Hama
n
o
Merge bran
c
h 'sp/
s
mart-http-content-type-che
c
k' into
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Merge
b
ranch 'jc/comb
i
ne-d
i
ff-many-parents' int
o
maint
commit
|
commitdiff
|
tree
2013-02-25
J
u
nio C
H
amano
M
erge branc
h
'jk/apply-similar
i
tly-parsing' into maint
commit
|
commitdiff
|
tree
2013-02-25
J
unio C
H
amano
M
erge branch 'jk/remote-he
l
p
e
r
s
-do
c
'
i
nto
main
t
commit
|
commitdiff
|
tree
2013-02-25
Junio
C
Hamano
Merge br
a
nch 'ab/gitweb-use-sa
m
e-scheme' into main
t
commit
|
commitdiff
|
tree
2013-02-25
Ju
n
i
o
C Ha
m
an
o
M
erge bra
n
ch 'zk/c
l
ean-
r
e
p
ort-fa
i
lure' into maint
commit
|
commitdiff
|
tree
2013-02-25
J
u
nio C Hamano
Merge branch 'nd/clone-n
o
-
se
p
ara
t
e-git-dir-
w
it
h
-b
a
re
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Ju
n
io C Ham
a
no
Merge bra
n
ch 'da/p4me
r
ge-mk
t
emp' into maint
commit
|
commitdiff
|
tree
2013-02-20
J
unio C H
a
mano
Sync with
v1
.
8
.
1
.
4
commit
|
commitdiff
|
tree
2013-02-20
Ju
n
io
C Hamano
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/imap-send-ssl-ver
i
fy' into m
a
in
t
commit
|
commitdiff
|
tree
2013-02-19
Jun
i
o C Ham
a
no
name-hash: allow hashing an e
m
pty
s
t
ring
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-19
Juni
o
C
H
amano
im
a
p-send: move #ifd
e
f around
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-19
Junio C Ham
a
n
o
Merg
e
branch
'j
c
/men
t
ion-
t
racking
-
for-pu
l
l-defau
l
t'
commit
|
commitdiff
|
tree
2013-02-19
Junio C Ham
a
no
Merg
e
branch
'
m
m/
c
o
n
fi
g
-
intro
-
in-git-doc'
commit
|
commitdiff
|
tree
2013-02-18
Junio C H
a
mano
RelNotes 1
.
8
.
2: pu
s
h-sim
p
le will not
b
e
in effect in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-18
Junio C Ha
m
ano
user-manual:
t
y
pofix (oft
h
e-
>
of the)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-18
Junio C
Hamano
Me
r
ge branch 'maint
'
commit
|
commitdiff
|
tree
2013-02-18
J
unio C H
a
mano
Merge git://github
.
com/git-l10n/gi
t
-
p
o
commit
|
commitdiff
|
tree
2013-02-17
Junio C Ham
a
no
Git 1
.
8
.
2-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-17
Junio C Hamano
Merge branch 'jc/hidden-re
f
s'
commit
|
commitdiff
|
tree
2013-02-17
Ju
n
io C H
a
m
ano
Mer
g
e bran
c
h 'mp/d
i
ff-algo-conf
i
g
'
commit
|
commitdiff
|
tree
2013-02-17
J
unio C Hamano
Merge branch '
m
w/b
a
sh-pro
m
p
t-s
h
ow-untracke
d
-
c
o
n
fig'
commit
|
commitdiff
|
tree
2013-02-17
Junio C
Hamano
Merge branch 'jk/rebase-i
-
comm
e
nt-char'
commit
|
commitdiff
|
tree
2013-02-17
Ju
n
io C Hamano
Merge b
r
an
c
h
'jk/read
-
commit-bu
f
fer-data-af
t
e
r
-free
'
commit
|
commitdiff
|
tree
2013-02-15
Junio C Haman
o
Update draft r
e
lea
s
e notes
t
o
1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-15
Junio C Hamano
Merge branch 'wk/man-de
n
y-current-branch-
i
s
-default
.
.
.
commit
|
commitdiff
|
tree
2013-02-15
Junio
C
H
ama
n
o
Merge branc
h
'mk/make-rm-dep
d
irs-could-be-empt
y
'
commit
|
commitdiff
|
tree
2013-02-15
Junio C Hamano
Merge branch 'mm/c
o
nfig-l
o
cal-c
o
mpletion'
commit
|
commitdiff
|
tree
2013-02-15
Jun
i
o
C
Haman
o
Merge branch 'ef/non-ascii-
p
arse-options
-
erro
r
-d
i
a
g'
commit
|
commitdiff
|
tree
2013-02-15
Junio C
Hamano
Merge
branch
'
m
k/old-expat'
commit
|
commitdiff
|
tree
2013-02-15
Junio C Ha
m
an
o
Merge bran
c
h 'da/
p
4merge-mktemp-fix'
commit
|
commitdiff
|
tree
2013-02-14
Junio C Ham
a
no
Docum
e
nt
a
tion/g
i
t-add: ki
l
l remaining <
f
ilepattern>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-14
Junio C Ha
m
ano
Update dra
f
t r
e
le
a
se
n
otes to
1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-14
Ju
n
io C Hamano
Merge branch 'jk/diff
-
gra
p
h-clea
n
up'
commit
|
commitdiff
|
tree
2013-02-14
Juni
o
C Hamano
Merge branch
'
nd/status-
s
how-in-prog
r
ess'
commit
|
commitdiff
|
tree
2013-02-14
Ju
n
io C Hamano
Merge bra
n
ch
'
mm/remo
t
e-
m
ediawiki-buil
d
'
commit
|
commitdiff
|
tree
2013-02-14
Junio C Hamano
Mer
g
e bran
c
h 'bw
/
g
e
t
-tz-offset-
p
erl'
commit
|
commitdiff
|
tree
2013-02-14
Junio C Hamano
Merge bran
c
h 'al/
m
e
r
g
e
too
l
-printf-fix'
commit
|
commitdiff
|
tree
2013-02-14
Juni
o
C Hamano
Mer
g
e br
a
n
ch
'jk/error-const
-
return'
commit
|
commitdiff
|
tree
2013-02-14
Junio C Ham
a
no
M
e
rge branc
h
'jx/
u
tf8-printf-wi
d
th
'
commit
|
commitdiff
|
tree
2013-02-14
Junio C
H
amano
Merge b
r
a
n
ch 'mg/
b
isec
t
-doc'
commit
|
commitdiff
|
tree
2013-02-14
Junio C Hamano
Merge
b
r
a
nch 'tz/perl-styles'
commit
|
commitdiff
|
tree
2013-02-14
Junio C
H
amano
Merge branch 'jc
/
e
x
tended-fake-ancestor-for-gitlink'
commit
|
commitdiff
|
tree
2013-02-14
Ju
n
io C Ham
a
n
o
Merge b
r
anch '
d
g/sub
t
ree-f
i
xe
s
'
commit
|
commitdiff
|
tree
2013-02-12
Ju
n
io C Ha
m
ano
Me
r
g
e b
r
anch 'maint'
commit
|
commitdiff
|
tree
2013-02-11
Junio
C Hamano
Update draft release no
t
es to 1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-11
J
u
nio C Hamano
Merge br
a
nch
'
maint'
commit
|
commitdiff
|
tree
2013-02-11
Junio C Hamano
M
erge branc
h
's
p
/
s
m
art-http-conte
n
t
-type-che
c
k'
commit
|
commitdiff
|
tree
2013-02-09
Ju
n
io C Hama
n
o
Merg
e
branch 'master'
of
g
it://github
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2013-02-08
Junio
C
H
a
m
ano
Merge bra
n
ch 'jc
/
combi
n
e-diff-many-
p
are
n
ts'
commit
|
commitdiff
|
tree
2013-02-08
Junio C Hamano
Merg
e
branch
'
jk/apply-s
i
milaritly-parsing'
commit
|
commitdiff
|
tree
2013-02-08
Juni
o
C
Hamano
Merge
b
ranch 'mk/tcsh-
c
omplete-o
n
l
y
-
know
n
-paths'
commit
|
commitdiff
|
tree
2013-02-08
Junio C Hama
n
o
M
e
rge
b
ranch 'mp/
c
omplete-paths'
commit
|
commitdiff
|
tree
2013-02-08
Junio C Ham
a
n
o
Merg
e
bran
c
h
'ct/
a
utoconf-ht
m
l
d
i
r'
commit
|
commitdiff
|
tree
2013-02-07
Junio C Hamano
Updat
e
dra
f
t re
l
ease no
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
Junio C
Hamano
Git 1
.
8
.
1
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-07
Junio C Haman
o
Merge
b
r
anch 'mz/pick-unborn' into maint
commit
|
commitdiff
|
tree
2013-02-07
Juni
o
C
Hamano
M
e
r
ge branch 'nd/f
i
x-perf-parame
t
ers-in-test
s
'
into
.
.
.
commit
|
commitdiff
|
tree
2013-02-07
Junio
C Hamano
Mer
g
e branch 'jc/do-not-let-rando
m
-fi
l
e-interfere
-
with
.
.
.
commit
|
commitdiff
|
tree
2013-02-07
Junio
C Hamano
Me
r
g
e branch 'f
t
/
transport-report-se
g
v' into
m
aint
commit
|
commitdiff
|
tree
next