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-02-07
J
u
nio C Ham
a
no
Merge branc
h
'
sb/gpg-plu
g
-fd-leak
'
into
maint
commit
|
commitdiff
|
tree
2013-02-07
J
unio C Hamano
M
erge branch 'jc/fake-ance
s
tor-w
i
th-non
-
b
lobs'
into
.
.
.
commit
|
commitdiff
|
tree
2013-02-07
Jun
i
o C H
a
mano
Me
r
ge branc
h
'jn
/
aut
o
-depend-work
a
round-bug
g
y-cca
c
he
.
.
.
commit
|
commitdiff
|
tree
2013-02-07
J
unio C
Hamano
M
erge branch 'da/mergeto
o
l-
d
oc
s
'
commit
|
commitdiff
|
tree
2013-02-07
Junio C Hamano
Merge branch 'ss/mergeto
o
l
s
-tortoise'
commit
|
commitdiff
|
tree
2013-02-07
Jun
i
o C Hamano
Merge
branch '
j
k/me
r
getool'
commit
|
commitdiff
|
tree
2013-02-07
Ju
n
i
o
C H
a
mano
Merge branch
'
jk/doc-ma
k
efile-cle
a
nup'
commit
|
commitdiff
|
tree
2013-02-07
Junio C Hamano
Merge br
a
n
ch 'jk/remote-
h
e
lper
s
-doc'
commit
|
commitdiff
|
tree
2013-02-07
J
u
nio
C Haman
o
Merge br
a
nch 's
b
/run-command-fd
-
error-
r
eport
i
ng'
commit
|
commitdiff
|
tree
2013-02-07
Junio C H
a
m
a
no
Merge branch
'nd/bra
n
ch-error-cases'
commit
|
commitdiff
|
tree
2013-02-07
Junio C Hamano
M
erge branch
'
sb
/
gpg-i18n'
commit
|
commitdiff
|
tree
2013-02-07
Junio C Hamano
Merge branch 'jk/py
t
hon-st
y
l
es'
commit
|
commitdiff
|
tree
2013-02-07
Junio C H
a
mano
Merge branch 'ab/gitweb-use-same
-
scheme'
commit
|
commitdiff
|
tree
2013-02-07
J
u
n
io C Hamano
upload/receive-pack: a
l
low hiding ref hierarchies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-06
J
u
n
i
o C Hamano
Update
d
r
a
ft r
e
le
a
se notes to
1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-06
Juni
o
C Hama
n
o
Merge
b
r
anch '
j
n/auto-de
p
e
nd-workarou
n
d-buggy-ccache'
commit
|
commitdiff
|
tree
2013-02-06
J
u
nio C
Hamano
Merge branch '
t
a/doc-
n
o-small
-
caps'
commit
|
commitdiff
|
tree
2013-02-06
Junio C Hamano
M
e
rge b
r
anch 'jc/fake-anc
e
s
tor-wit
h
-non-blobs
'
commit
|
commitdiff
|
tree
2013-02-06
J
u
n
io C Ham
a
no
Merge branch 'sb/gpg-plug-fd-leak'
commit
|
commitdiff
|
tree
2013-02-06
Junio C
H
aman
o
Merg
e
b
r
anch 'ft
/
transport-
r
epo
r
t-segv'
commit
|
commitdiff
|
tree
2013-02-05
Junio C
H
a
m
a
no
apply: veri
f
y submodule commit obje
c
t
name bett
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-05
Junio C
H
amano
t5551: fix
e
x
pected error output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-04
Jun
i
o C Hamano
U
p
dat
e
draft rele
a
se notes to 1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-04
Junio C Ham
a
no
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2013-02-04
Junio C Hamano
Merg
e
br
a
nch 'jk/remote-helpers-
i
n
-
python-3'
commit
|
commitdiff
|
tree
2013-02-04
Ju
n
io C Hamano
M
e
rge br
a
nch 'pw/git-p4-on
-
cyg
w
in'
commit
|
commitdiff
|
tree
2013-02-04
Junio C Hamano
Mer
g
e
b
ranch 'jk/read-comm
i
t
-
buffer-data
-
after-
f
ree'
commit
|
commitdiff
|
tree
2013-02-04
J
unio C Hamano
Mer
g
e
branch 'mm/add-u-A-sans-
p
a
thspec
'
commit
|
commitdiff
|
tree
2013-02-04
Junio
C
Ham
a
no
M
er
g
e branch 'jc/push
-
reject-reasons'
commit
|
commitdiff
|
tree
2013-02-04
Jun
i
o C
H
aman
o
Merge
b
r
anch 'jk/co
n
fig-parsing-cleanup'
commit
|
commitdiff
|
tree
2013-02-04
Junio
C
H
amano
M
e
rge branc
h
'jc/custom-
c
omment-cha
r
'
commit
|
commitdiff
|
tree
2013-02-04
Jun
i
o C H
a
mano
Start pre
p
a
r
ing for
1
.
8
.
1
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-04
Junio C
H
ama
n
o
Me
r
ge b
r
anch
'
bc/git-
p
4-f
o
r
-
python-2
.
4' i
n
to maint
commit
|
commitdiff
|
tree
2013-02-04
Junio C Hamano
Merge br
a
n
c
h 'nd/edit
-
branch-desc
-
while-detached' into
.
.
.
commit
|
commitdiff
|
tree
2013-02-04
Junio C H
a
m
a
no
Merge branch 'jn/do-not-drop
-
u
s
ername-when-reading
.
.
.
commit
|
commitdiff
|
tree
2013-02-04
Jun
i
o
C
H
amano
Merge
b
ranch
'
jk/cv
s
i
mport-does-not-work-with-cvsps
3
.
.
.
commit
|
commitdiff
|
tree
2013-02-04
Juni
o
C Hamano
Merge branch 'd
l
/
a
m
-hg-locale'
int
o
maint
commit
|
commitdiff
|
tree
2013-02-04
Ju
n
io C
H
a
mano
M
erge branch 'jc/help' in
t
o maint
commit
|
commitdiff
|
tree
2013-02-04
Junio C
H
amano
Merge bran
c
h
'jc
/
mer
g
e-blobs' into maint
commit
|
commitdiff
|
tree
2013-02-04
J
u
nio C Ham
a
no
Merge
branc
h
'jc/doc
-
maintainer'
i
n
to maint
commit
|
commitdiff
|
tree
2013-02-04
Juni
o
C Hamano
Me
r
ge branch 'bc/f
i
x-arr
a
y
-
s
ynt
a
x-fo
r
-
3
.
0-in-completion
.
.
.
commit
|
commitdiff
|
tree
2013-02-03
Junio C H
a
man
o
c
ombine-
d
iff: lift 32-
w
ay
l
imit of combined diff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-01
J
u
nio C Ha
m
ano
Documentation: de
s
c
ribe
t
he
"re
p
o
sitory"
i
n
repo
s
itory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-01
J
u
nio C
H
amano
Update draft release notes
to 1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-01
J
unio C Hamano
Merge
b
ranch 'n
d
/edit-b
r
anch-de
s
c-while-detached'
commit
|
commitdiff
|
tree
2013-02-01
Juni
o
C Hama
n
o
Merge
b
ranch 'jk/gc
-
a
u
t
o-after-fetch'
commit
|
commitdiff
|
tree
2013-02-01
Junio C
Hamano
Merge
branch 'bc/git-p4-
f
o
r
-py
t
hon-2
.
4'
commit
|
commitdiff
|
tree
2013-02-01
Ju
n
io C Ha
m
ano
Merge
b
r
anch 'jn/do
-
n
o
t
-drop
-
u
s
ername-when-readi
n
g
.
.
.
commit
|
commitdiff
|
tree
2013-02-01
Junio C Hamano
Me
r
g
e branch '
j
k
/
c
vsimport-d
o
es-not-work-
w
ith-c
v
sps3'
commit
|
commitdiff
|
tree
2013-02-01
Junio C Hamano
Me
r
ge branch
'
j
c
/do
-
not-
l
e
t-random-fi
l
e-interfere-wit
h
.
.
.
commit
|
commitdiff
|
tree
2013-02-01
Junio
C Ha
m
ano
Merge branch
'
a
s/test-cleanup'
commit
|
commitdiff
|
tree
2013-02-01
Junio C Hamano
Merg
e
branch 'jc/
n
o-git-config
-
in-clone'
commit
|
commitdiff
|
tree
2013-02-01
Junio C Hamano
M
e
rge
br
a
n
c
h 'nd
/
f
etch-depth-is-broke
n
'
commit
|
commitdiff
|
tree
2013-02-01
J
u
nio C Hamano
apply: diagnose inc
o
mplete submodule objec
t
n
ame better
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-01
Junio C Hamano
apply: simpl
i
fy bu
i
ld_fake_anc
e
stor()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-01
Jun
i
o C Hamano
git-am: reco
r
d
f
ull ind
e
x line in the patch use
d
while
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-01
J
unio C Ha
m
ano
d
oc: mention tracking
f
or pull
.
default
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-30
Junio C Haman
o
Merg
e
g
i
t:
/
/ozlabs
.
org/~pau
l
us/gitk
commit
|
commitdiff
|
tree
2013-01-30
Junio C Hama
n
o
git_re
m
ote_helper
s
: remo
v
e
GIT-PYTHON-VERSION upon
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-30
Junio C Hamano
INSTAL
L
: git
-
p4
does not
supp
o
rt Py
t
hon 3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-30
Junio C
Hamano
Merge br
a
nch 'n
d
/edit-br
a
n
ch-desc-wh
i
le-de
t
ached'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2013-01-30
Junio C Hamano
Merge branc
h
'rr/mi
n
imal-sta
t
'
commit
|
commitdiff
|
tree
2013-01-30
Junio
C
Ha
m
ano
Merge branch 'nd/
m
agic-pathspec
-
fr
o
m-ro
o
t'
commit
|
commitdiff
|
tree
2013-01-30
Junio C
H
amano
Me
r
ge
b
ranch
'
m
aint'
commit
|
commitdiff
|
tree
2013-01-30
Junio C
H
amano
Merge branch 'tb/t0050-ma
i
nt
'
into maint
commit
|
commitdiff
|
tree
2013-01-29
J
unio
C
Hamano
Mer
g
e branch 'n
d
/fix-d
i
re
c
tory-attrs-off-by-
o
ne' into
.
.
.
commit
|
commitdiff
|
tree
2013-01-29
Junio C
Hamano
Merge branc
h
'ph/rebase-preserv
e
-al
l
-me
r
ges' into mai
n
t
commit
|
commitdiff
|
tree
2013-01-29
Junio C Hamano
README: u
p
date st
a
le and/or inc
o
rrect i
n
fo
r
ma
t
io
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-29
Junio C
H
aman
o
upload-pack
:
simpl
i
fy reque
s
t validation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
Jun
i
o C
Hamano
Upd
a
te draft
r
elease not
e
s
to 1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
Junio
C H
a
m
ano
Sync with 1
.
8
.
1
.
2
commit
|
commitdiff
|
tree
2013-01-28
J
u
nio
C Haman
o
G
i
t 1
.
8
.
1
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
Junio C Ha
m
ano
M
erge branch
'
ss/help
-
htmlpath-config-doc' into maint
commit
|
commitdiff
|
tree
2013-01-28
Junio C Haman
o
Merge bra
n
ch
'
nd/attr-de
b
ug-f
i
x
'
i
nto maint
commit
|
commitdiff
|
tree
2013-01-28
Juni
o
C Hamano
M
e
rge branch 'ds/c
o
mpletion-
s
i
l
enc
e
-in-tree-
p
ath-probe
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
J
u
n
i
o
C Hamano
Merge branch 'jn/mai
n
t
-
trim-vim
-
co
n
trib'
i
n
t
o maint
commit
|
commitdiff
|
tree
2013-01-28
Junio C
H
ama
n
o
Merge branch '
p
e/doc-email-env-is-trumpe
d
-by-config
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Ju
n
i
o C H
a
mano
M
e
rge branch 'mk/co
m
p
l
ete
-
tcsh' into maint
commit
|
commitdiff
|
tree
2013-01-28
Juni
o
C
Hamano
M
e
rge branch 'ap/s
t
atus-ignored-in-i
g
nored-directory
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Mer
g
e branch 'er/sto
p
-
r
e
co
m
mending-parsecvs' int
o
maint
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Merge
branch 'mh/ceiling' into maint
commit
|
commitdiff
|
tree
2013-01-28
J
unio C Hamano
Me
r
ge
branc
h
'tb/t
0
050-
m
ain
t
'
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Merg
e
b
ranch 'dl/am
-
hg-loca
l
e'
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
M
e
rge branch 'jc/help'
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
M
e
r
ge
branch 'bc/f
i
x-array-synta
x
-for-3
.
0-in
-
c
ompletion
.
.
.
commit
|
commitdiff
|
tree
2013-01-27
Jun
i
o C Hamano
Merge branc
h
'jk/maint-gc-auto-
a
f
ter-fetch' int
o
jk
.
.
.
commit
|
commitdiff
|
tree
2013-01-25
Junio
C
Ha
m
ano
Me
r
ge br
a
nc
h
'
f
or-junio' of
git://bogomips
.
o
rg/git
-
svn
commit
|
commitdiff
|
tree
2013-01-25
Juni
o
C Hama
n
o
U
p
date d
r
aft re
l
ea
s
e notes
t
o 1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
J
unio C Hamano
Merge branch
'nd/retire-fnmatch'
commit
|
commitdiff
|
tree
2013-01-25
J
u
nio C Ham
a
no
Merge bra
n
c
h
'jc/doc-maintainer'
commit
|
commitdiff
|
tree
2013-01-25
Junio C Hamano
how
t
o/mai
n
tain: doc
u
ment "###
m
atch next" convention
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
Junio C H
a
mano
push: finishing touches
t
o
e
xplain REJE
C
T_AL
R
EADY_EXIS
T
S
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Junio C H
a
mano
t
9
902: protect test fro
m
stray build
a
rtif
a
c
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Junio C Ha
m
a
no
push: introd
u
ce R
E
JECT_FETCH_FI
R
S
T and REJECT_NEEDS_FORCE
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Junio
C
Hamano
p
u
sh: further simplify the logic to assign r
e
jec
t
i
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Junio
C H
a
ma
n
o
pus
h
: furt
h
er clean up fields of "s
t
r
uct ref"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Junio C Hama
n
o
Merge bra
n
ch 'as/pre-push-hook'
commit
|
commitdiff
|
tree
2013-01-24
Junio C
Hamano
M
e
r
g
e bra
n
ch 'ch/add-au
t
o-submitted-in-sample-post
.
.
.
commit
|
commitdiff
|
tree
2013-01-24
J
u
nio C Ham
a
no
Merge bran
c
h 'as/check-igno
r
e'
commit
|
commitdiff
|
tree
2013-01-24
Junio
C
Hamano
Merge branch
'
r
s
/clar
i
f
y
-entry-
c
mp-ssl
i
ce'
commit
|
commitdiff
|
tree
next