repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jk/maint-commit-amend-only-no-paths'
2012-07-16
Junio C Hamano
Merge branch 'j
k
/
m
a
i
nt-commit-a
m
end-only-no-paths'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merg
e
branch 'cw/ame
n
d-commit-wit
h
out-message'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ham
a
n
o
Me
r
ge branch 'jn/makefile-cleanup'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C
Hamano
M
e
rge branch 'ar/clone-honor-
u
mask-at-top'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merg
e
bran
c
h 'j
c
/apply-
3
wa
y
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge br
a
nch
'
c
w/r
e
base-i-root'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ham
a
no
Merge
b
r
anch 'pw/git-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Junio C H
a
m
a
no
Merge branch 'pw/git-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
J
u
nio C Haman
o
Me
r
ge branch 'jk/push
-
delete-ref-error-message'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C
Ham
a
no
Sixth batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch 'jc/refactor-
d
iff
-
stdin
'
commit
|
commitdiff
|
tree
2012-07-13
J
un
i
o C Ha
m
ano
M
e
rge
branch
'tg/
c
e
-namelen'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
i
o
C
H
amano
Merge branch 'tb/sanitize-decomposed-u
t
f-8-pathname'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C
Ham
a
no
Mer
g
e
branch 'm
m
/m
e
diawiki-tests'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C
H
amano
Merge branch 'jn/v
c
s
-svn'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Ha
m
ano
Merge branch
'
mm/med
i
awiki-file-attachm
e
nts'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge bra
n
ch '
t
r/maint-s
h
ow-w
a
l
k
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge
b
ranc
h
'
mz/rebase-no-mbox'
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
H
amano
Reduce draf
t
relea
s
e
notes to 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Sync
wit
h
1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
G
it
1
.
7
.
11
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Ham
a
no
Merge branc
h
'jc
/
maint-blame-un
i
que-a
b
brev' into main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Merge br
a
nch '
r
j/platform-pr
e
ad-may-be-thread-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
Merge b
r
a
n
c
h
'
th/diff
-
n
o
-inde
x
-fi
x
es' in
t
o ma
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
H
amano
Merge branch 'nd/clone-single-fix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Ha
m
ano
M
erge
b
ra
n
ch '
j
c
/
rev-lis
t
-simpli
f
y-merges-firs
t
-pa
r
ent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
a
m
ano
Merg
e
branch
'hv/submodu
l
e
-
update-nuke-submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
uni
o
C Hamano
Merge br
a
nc
h
'jk/diff-
n
o-index
-
p
a
ger' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge bran
c
h 'mm/verify-filename-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
erge
b
ranch 'cn/cher
r
y-pi
c
k-ra
n
ge-d
o
cs' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C H
a
ma
n
o
Merge branch
'jc/ustar-
c
h
e
cksum-is-un
s
i
gned' into maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge bra
n
ch
'
jc/bundle
-
comp
l
ete-notice'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge branch 'jc
/
ls-fil
e
s-i-d
i
r' into
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
n
o
M
e
r
g
e
b
ranch '
j
c/request-pull-match-ta
g
name'
int
o
maint
commit
|
commitdiff
|
tree
2012-07-10
Junio
C
Hamano
a
p
p
ly
:
tests for
the
--
3
way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C H
a
mano
rerere: m
a
ke rr-ca
c
he fanout
d
i
r
ect
o
r
y hono
r
uma
s
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
apply: document --3
w
ay op
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o C H
a
mano
apply: allow
re
r
ere() to
w
ork on
-
-
3way results
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Ha
m
ano
apply: r
e
gist
e
r conflicted sta
g
es
t
o
the index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
apply: -
-
3way with ad
d
/add conflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
H
amano
appl
y
: mov
e
verify_index_match() high
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
apply: plug
t
he th
r
e
e
-way me
r
ge
l
o
gic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Haman
o
apply: fall
b
ack on three
-
way me
r
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply
:
a
cc
e
p
t -3/--3way command line opti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
p
ly: move "already exists"
l
o
g
ic to check_to_
c
reate()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
a
pply:
m
ove check_t
o
_
cr
e
ate_blob() closer
t
o
i
t
s sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
amano
a
ppl
y
:
furth
e
r s
p
lit load_pr
e
i
mag
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
Hamano
apply: refactor "previous patch
"
logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ha
m
ano
apply: split load_preimage() helpe
r
function out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply
:
factor out c
h
e
c
k
o
ut_targe
t
()
h
e
lper function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
a
p
ply: refactor re
a
d
_f
i
le_or_gitli
n
k()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
apply: clear_
i
mage() clears
things a bit more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply: a
bit more comments
o
n PATH_TO_B
E
_D
E
LET
E
D
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
appl
y
:
f
ix
an incomplete comme
n
t
i
n check_pa
t
ch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge git:/
/
github
.
com/gi
t
-l10
n
/
g
it-po
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Fifth batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Merge b
r
anch 'cw/help
-
over-netw
o
rk'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Ha
m
ano
Merge branch 'mz/emp
t
y-reb
a
se
-
test'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Me
r
ge
br
a
nch 'pw/git-
p
4-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge
b
ran
c
h 'js/fast-export-paths-with-
s
paces'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
M
erge bran
c
h '
c
w/no-detach
i
ng-an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ham
a
no
M
e
rge
branch 'vr/use-
o
ur-per
l
-
in-tests
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
M
e
r
g
e branch
'
m
m
/credential
-
plumbi
n
g'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Merge branch 'j
c
/maint-blame-unique-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merg
e
branch 'jn
/
pe
r
l-makemaker
-
leading-pa
t
hs'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge b
r
anch 'rj/platform-pread-may-be-th
r
ead-unsa
f
e'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Hamano
Merge
b
ranch 'mm/conf
i
g-x
d
g'
commit
|
commitdiff
|
tree
2012-07-05
Ju
n
io C Hamano
Fourth batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge branch 'nd/clone-single-fix
'
commit
|
commitdiff
|
tree
2012-07-05
Junio
C
Hamano
Merge branc
h
'th/
d
iff-n
o
-index-fixes'
commit
|
commitdiff
|
tree
2012-07-05
Juni
o
C
H
a
mano
Merge br
a
nch
'hv/remote-end-
h
ung-u
p
'
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
S
ync with i1
8
n-po updates in maint
commit
|
commitdiff
|
tree
2012-07-02
Junio
C
Hamano
Merge branch
'maint' of git://githu
b
.
com/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Juni
o
C Hamano
blame
:
compute abbr
e
viation width th
a
t en
s
ures uni
q
u
ene
s
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
i
o
C
H
ama
n
o
diff-index
.
c: "g
i
t diff" ha
s
n
o
n
eed to r
e
ad b
l
o
b
f
r
o
m
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
diff-index
.
c: u
n
ify h
a
ndling of c
o
mmand
line paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C H
a
mano
diff-
i
nd
e
x
.
c: do not
p
ret
e
nd p
a
ths are pathspecs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Thi
r
d batch
for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ham
a
no
Merge b
r
anch 'fc/gi
t
-pro
m
pt-script'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
Ham
a
no
Merge branch 'js
/
submodu
l
e-relative'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Hamano
Merge branch '
l
k/more-hel
p
ful-st
a
tus-hints
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ham
a
no
M
erge
b
ra
n
c
h 'lk
/
reb
a
se-i-
x
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ha
m
a
no
Merge branc
h
'
j
c/rev-list-
s
i
mplify-merges-first
-
parent'
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C Hama
n
o
M
e
rge branch 'hv/submodule-update-n
u
ke-submodules'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Hama
n
o
Merg
e
br
a
n
ch
'
nd/exclude-workaround-top-he
a
vy'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
amano
Merge branch 'nd/stre
a
m
-pack
-
object
s
'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Hamano
Merge br
a
nch
'
n
d
/stream-index
-
pack'
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
i
o
C H
a
mano
Merge branch 'mm/verify
-
file
n
ame-fi
x
'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C
H
amano
Merge br
a
nch 'jk
/
diff-no-index-pager'
commit
|
commitdiff
|
tree
2012-06-26
Junio C Hamano
i
ndex-pack: Disable threading on cygwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Jun
i
o C Hamano
Sec
o
n
d batch
for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Ham
a
no
Merge
branch 'lp/
n
o-cmd-http-fetch'
commit
|
commitdiff
|
tree
2012-06-25
Junio C
H
amano
Merge branch '
c
n
/
c
h
erry-pick
-
range-docs'
commit
|
commitdiff
|
tree
2012-06-25
Juni
o
C Hama
n
o
M
e
r
ge b
r
anch 'lm/git-blame-el'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Mer
g
e branch
'
rs/ipv6-ssh-url'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Ha
m
ano
Me
r
ge branch 'jc/ust
a
r-
c
hecksum-is-unsigned'
commit
|
commitdiff
|
tree
2012-06-25
Junio C
H
amano
Merg
e
br
a
nch 'rs/git-blame-map
c
ar-map
c
'
commit
|
commitdiff
|
tree
2012-06-25
J
u
nio C Hamano
Merg
e
branch 'rr
/
doc-c
o
mm
i
t
'
commit
|
commitdiff
|
tree
2012-06-25
J
u
nio C Haman
o
Merge branch 'nd
/
i18n-misc'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branc
h
'nd/i
1
8n-branc
h
-lego'
commit
|
commitdiff
|
tree
next