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 'jx/i18n-1.7.11'
2012-07-11
Juni
o
C Ham
a
n
o
Sync with 1
.
7
.
1
1
.
2
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Gi
t
1
.
7
.
11
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io
C
Hamano
Merge br
a
nch 'jc/m
a
int-blame-un
i
q
u
e-abb
r
e
v
' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch
'rj
/
platform-pread-m
a
y-be-thread-un
s
afe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Merge bran
c
h 'th/diff-no-i
n
de
x
-
f
i
x
e
s
' into
m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Merge branch 'nd/clone-single-fix' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
J
un
i
o C
H
am
a
no
Mer
g
e branch 'jc/rev-l
i
st-
s
implify-me
r
g
e
s-first-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'hv/submodule-update
-
n
u
ke-
s
ubmodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge br
a
nch 'jk/diff-n
o
-index-pager' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
b
ranch 'mm/ve
r
i
fy-filename
-
fix' int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hama
n
o
M
erge branc
h
'cn/cherr
y
-pic
k
-range-doc
s
' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C H
a
mano
M
e
rge branch 'jc/ustar-checksum-
i
s-unsigned'
i
nto main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Merge branch
'
jc/bu
n
d
le-c
o
mp
l
e
t
e-
n
otice
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jc/ls-files-i-dir' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Mer
g
e branch '
j
c/requ
e
s
t
-pull-match-tagname'
i
n
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
am
a
no
Merge
branch 'tg/
m
aint-cache-name-
c
om
p
are' into tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
a
no
cache_na
m
e_compare(
)
: do not trun
c
ate w
h
i
l
e
c
om
p
a
r
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
apply:
t
ests for the --3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Ju
n
i
o
C Hamano
fi
l
ter-bra
n
c
h
: do no
t
f
o
rget the '@' prefix to force
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C
Hamano
rev-p
a
rse --disambiguate=<prefix>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rev
-
pars
e
:
A
and
B in "rev-parse
A
.
.
B" refer to committish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
reset: t
h
e command takes committish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
commit-tree: the co
m
mand wants a tree and commits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
ap
p
ly: --build-fake-
a
ncestor expects bl
o
b
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
Hamano
sha1_nam
e
.
c: add sup
p
ort for disa
m
b
iguat
i
ng othe
r
type
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hama
n
o
revision
.
c: the "
l
og" f
a
mily, except for "
s
how
"
,
takes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
revision
.
c: allow han
d
le_revision_arg() to
t
ake
o
t
her
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
sha1_na
m
e
.
c: introduce get_sha1_committish
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o
C
Hama
n
o
sh
a
1_name
.
c: t
e
ach lookup context t
o
get_sha1_with_context()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
s
h
a1_name
.
c: many
s
h
o
rt names can
o
nly
be committish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
s
h
a
1
_
name
.
c: get_sha1
_
1() tak
e
s lookup flags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C H
a
ma
n
o
sha1_name
.
c: get
_
descri
b
e
_
n
a
me() by definition groks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
ano
rerere:
m
ake r
r
-
c
ache fanout directory honor umask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Haman
o
app
l
y: document --3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply: a
l
low rer
e
re() to work on --3wa
y
results
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C Hamano
apply: register
c
onflicted stage
s
to the index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
ap
p
ly:
-
-3way w
i
th add/add conflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
apply: move
verify_index_m
a
t
c
h() highe
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: plug th
e
three-way me
r
ge
l
ogi
c
in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hama
n
o
apply: fall back on three-wa
y
m
e
rge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly: acc
e
p
t
-
3/--3way command
line option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
appl
y
:
m
ove "already
e
x
ists" logic to
check_
t
o_creat
e
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply: move ch
e
ck_to_create_bl
o
b()
closer to its sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply
:
further s
p
lit loa
d
_preimage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: refac
t
or "previous
p
atch" logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
appl
y
:
s
p
l
it load_preim
a
g
e() helper f
u
n
c
tion out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: factor out check
o
ut_ta
r
get(
)
helper
f
unction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
H
amano
a
p
p
ly
:
r
efactor
r
ead_file_or_gitlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: clea
r
_image()
c
lear
s
t
h
i
n
gs a
b
it mor
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
appl
y
: a bit more com
m
ents on P
A
TH
_
T
O_BE_DELETE
D
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
appl
y
:
fix an incomple
t
e comment
i
n
check_patch
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C
Hama
n
o
Me
r
ge git://githu
b
.
com
/
git-l10n/gi
t
-po
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
F
ifth batch for 1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ham
a
no
Merge branch 'cw
/
help-over-netwo
r
k
'
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o
C Hamano
Merge branch 'mz
/
empt
y
-re
b
ase-test'
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C H
a
m
ano
Merge branch
'
pw/git-p4-te
s
ts'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
Merge branch 'js/f
a
s
t-export-path
s
-with-space
s
'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
Merg
e
bran
c
h 'cw/no-d
e
tac
h
i
n
g-an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Mer
g
e branch 'vr/use
-
ou
r
-perl-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Merge bra
n
c
h
'mm/credential-plumbing
'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Merge branch 'jc/maint-b
l
am
e
-unique-abbre
v
'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Merge branch 'jn/perl
-
makema
k
er-leadin
g
-paths'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ha
m
a
no
Merge b
r
anch 'rj
/
platform-
p
r
ead-may-
b
e-thread-u
n
safe'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
Merg
e
b
r
anch
'mm/
c
o
nfig-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Junio C
Hamano
F
o
urth b
a
tch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Junio C Ha
m
ano
Merge br
a
nch 'nd/clone-s
i
ngle-fix'
commit
|
commitdiff
|
tree
2012-07-05
Ju
n
io C
H
amano
M
e
r
g
e bra
n
ch
'
th/diff-no-
i
ndex-fixes'
commit
|
commitdiff
|
tree
2012-07-05
Junio
C
H
amano
Merge branch 'hv/remote-end-hung
-
u
p
'
commit
|
commitdiff
|
tree
2012-07-03
Ju
n
i
o
C Ha
m
ano
sha1_name
.
c: teach
g
e
t
_short_sha
1
() a commit-only option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C Hama
n
o
sha1_name
.
c: al
l
ow
g
et
_
short_
s
h
a
1
() to take other
flag
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
J
unio C Hamano
ge
t
_sha1(): fix error status
r
egression
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C
H
amano
s
ha1_name
.
c: re
s
tructure disam
b
iguat
i
o
n
of short names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Ha
m
ano
sha1_na
m
e
.
c
: correct mi
s
named "c
a
nonical" a
n
d "res"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Ham
a
n
o
s
h
a1_name
.
c: refa
c
tor
fin
d
_short_packed_ob
j
ect(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Jun
i
o C Hamano
s
h
a1_name
.
c: rena
m
e "now" to "cu
r
rent"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Ham
a
no
sh
a
1
_name
.
c:
c
larify what "fake" is for
i
n
fi
n
d_sh
o
rt_ob
j
ect
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
J
unio C Ha
m
ano
sha1
_
na
m
e
.
c: get rid of get_sha
1
_with_mode(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Ham
a
no
sha1_name
.
c:
g
et ri
d
of get_sha1_wit
h
_mode_1()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-02
Junio C Ham
a
no
S
y
nc with i18n-po updates
in main
t
commit
|
commitdiff
|
tree
2012-07-02
J
u
nio C Ha
m
ano
Merge br
a
nch 'm
a
int
'
of git://gi
t
hub
.
com/gi
t
-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
sha1_name
.
c: hide ge
t
_sha1_wi
t
h_context_
1
(
)
u
g
line
s
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-02
Junio C H
a
mano
bl
a
me: compute ab
b
reviation width t
h
at ens
u
res uniquen
e
s
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
d
i
f
f
-index
.
c
:
"
git diff" has no
need to rea
d
bl
o
b fr
o
m
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ham
a
no
diff-index
.
c
: unify
handling of command lin
e
paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
diff-index
.
c: do not pretend paths
a
re paths
p
ecs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Ha
m
ano
Third b
a
tch for 1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
Hamano
Merge
b
ra
n
ch
'
f
c
/git-pro
m
pt-
s
cript'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
Hamano
Merge
branch 'js/submo
d
u
le-rela
t
ive'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Me
r
ge branch 'lk/more-help
f
ul
-
s
t
a
t
u
s-hints'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Ham
a
no
Mer
g
e branch 'lk/
r
e
b
ase
-
i-x'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch 'jc/re
v
-list-sim
p
lify-merges-fi
r
st-
p
a
rent'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
M
erge branch 'hv/submodule-update
-
nuke-submodules
'
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C
Ham
a
no
M
erge branch '
n
d
/
excl
u
de-work
a
r
o
und-top-
h
eavy'
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio
C
Ham
a
no
Merge br
a
nch 'nd/stream-
p
ac
k
-ob
j
ects'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ha
m
ano
Merge branch 'nd/stre
a
m-index-pack'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch 'mm/v
e
rify-fil
e
nam
e
-fix'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merg
e
branch 'jk/diff-no-index-page
r
'
commit
|
commitdiff
|
tree
2012-06-26
Ju
n
i
o
C
H
am
a
no
inde
x
-pac
k
:
Dis
a
ble threading on cygwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Ham
a
no
Second batch f
o
r 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Juni
o
C
Hamano
M
e
rge branch 'lp/no-cmd-http-fetch'
commit
|
commitdiff
|
tree
next