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 git://github.com/git-l10n/git-po
2012-07-11
Junio
C
Hamano
t
1512: ignore
w
hite
s
pa
c
es i
n
wc -l output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Reduce d
r
a
f
t release not
e
s to 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
Sync with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hama
n
o
Git 1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
H
amano
Merge branch 'j
c
/
mai
n
t
-blame-unique
-
abb
r
ev'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
ni
o
C
Hama
n
o
M
erge branch 'rj/platform-pr
e
ad-may-be-thre
a
d-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io C Hamano
Me
r
ge branch
'
t
h/diff-no-index-fixes' into m
a
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge bran
c
h 'nd/clone-
s
ingle-fix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
Merge branch 'jc/rev-list
-
s
implify-merge
s
-fi
r
st-pare
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io C H
a
mano
Mer
g
e branch
'
hv/submo
d
ule
-
update-nuke
-
submod
u
l
e
s'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
e
rge branc
h
'
jk/dif
f
-no-index-pager
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
M
erge branch 'mm/verify-fi
l
ename-fi
x
' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Mer
g
e bra
n
ch 'cn/cherry-pick
-
range-docs' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Ha
m
a
n
o
Merge branch 'jc/ust
a
r
-
checksum
-
is-unsign
e
d' into main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
a
n
o
Merg
e
branch 'jc/bundle-complete-notice' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Merge branch 'jc
/
ls-file
s
-
i-dir' i
n
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Merge b
r
anch 'jc/req
u
est
-
pull-match-tagname' int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge branch
'
tg/
m
ain
t
-cache-name-compare'
into tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
unio C
Hamano
cache_name_compare(): do not truncate w
h
ile comparing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Ham
a
n
o
a
p
ply: test
s
for
the --3way
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
filter-branch: do not fo
r
g
e
t the '@' p
r
efix to force
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
r
ev-par
s
e --
d
isambiguate=<pr
e
fix>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
rev-parse: A and
B in
"rev-
p
ar
s
e
A
.
.
B" refer to committis
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
re
s
et
:
th
e
co
m
mand take
s
c
ommittish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hama
n
o
commi
t
-
tree: the command wa
n
ts a tree and commit
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
Haman
o
a
p
ply:
--buil
d
-fake-ancesto
r
expects
b
lobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
sha1_
n
ame
.
c: add support for disambiguatin
g
othe
r
t
ypes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
revision
.
c:
the "
l
og" fam
i
ly, except for "
s
how", takes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
r
evision
.
c
: al
l
ow handle_revision_arg() to t
a
ke other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sh
a
1_na
m
e
.
c: introd
u
ce
g
et_sh
a
1_
c
omm
i
ttish()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Hamano
sha1_na
m
e
.
c:
t
e
ach lookup context to get_sha1_w
i
th_cont
e
xt()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Ha
m
ano
sh
a
1_name
.
c:
m
a
n
y short names can only be committis
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha
1
_n
a
me
.
c: get_sha1
_
1() take
s
looku
p
fla
g
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
sha
1
_name
.
c: ge
t
_d
e
scribe_name() by definition groks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
re
r
e
re: make rr-c
a
che fanout directory honor
umask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
d
ocument --
3
way opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
a
m
ano
app
l
y: a
l
low
r
erere(
)
to work
o
n
-
-3wa
y
res
u
l
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Haman
o
apply:
regi
s
ter c
o
nflicted
s
t
ages to the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C Hamano
ap
p
ly: --3way with add/add conflic
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly: move
verify_in
d
ex_
m
atch() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ha
m
ano
apply: plug the three-way me
r
ge log
i
c in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Ham
a
n
o
apply
:
fall back on thr
e
e-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
apply: accept -3/--3way c
o
mmand lin
e
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ha
m
ano
apply: move
"already
exists"
l
og
i
c
to check
_
to_create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ham
a
n
o
a
p
pl
y
: mov
e
check_to
_
create_blob() c
l
oser to its so
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C
H
amano
apply: fur
t
her s
p
l
it load_preima
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ham
a
no
ap
p
ly: refac
t
o
r "previous patch" lo
g
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: split load_preima
g
e() helper fun
c
tion out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y: factor out checkout_
t
arget() helper
function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Haman
o
a
p
ply: ref
a
c
tor
r
ead_file_or_
g
itli
n
k()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
apply:
clear_image() clea
r
s
things a bi
t
more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Haman
o
a
p
p
ly: a bit mo
r
e
c
omme
n
t
s
on PATH_TO_
B
E_DE
L
ETE
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
aman
o
app
l
y: fix an incomplete comme
n
t i
n
check_patch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C H
a
m
a
no
Merge git://github
.
co
m
/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
Fif
t
h
b
atc
h
for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
Merge branc
h
'cw/help-
o
ver-
n
etwork'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'mz/empty-rebase-test'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Hamano
Merg
e
branch 'p
w
/git-p4-t
e
sts'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Merge br
a
nch 'js
/
fast-ex
p
ort
-
p
a
ths-w
i
t
h-s
p
aces'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
Mer
g
e bra
n
ch 'cw/no-detaching-an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Merge branch 'vr/use-our-pe
r
l-in-t
e
sts'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
e
rg
e
branch 'mm/credential-plumbing'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Me
r
ge branch 'jc/maint-b
l
ame-unique-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hama
n
o
Merge
b
ranch 'jn/perl-m
a
kemaker-lea
d
ing-paths'
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io
C
H
amano
Merge branch '
r
j/platfo
r
m-pread-may-be-thread-u
n
safe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'mm/c
o
nfig-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Junio C
H
amano
Fou
r
th
b
atch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Junio C Ha
m
a
n
o
Merge branch 'nd/clone-
s
ingle
-
fix'
commit
|
commitdiff
|
tree
2012-07-05
Jun
i
o C H
a
m
an
o
Merge branch 'th/diff-no-ind
e
x-fixe
s
'
commit
|
commitdiff
|
tree
2012-07-05
Junio C
Hamano
Merg
e
bran
c
h
'hv/remote-end-h
u
ng-up'
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hama
n
o
sha1_nam
e
.
c
:
teach get_
s
hort_sha1()
a co
m
mit-
o
nly opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
J
unio C Hamano
sha1_name
.
c: allow get_short_
s
ha1(
)
to
take other f
l
ags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
J
unio C Ham
a
no
get_sha1(): fix error status reg
r
ession
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Jun
i
o C
H
a
m
ano
s
ha1_name
.
c: restructure dis
a
mbig
u
ation o
f
short
name
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C Ha
m
ano
sha
1
_name
.
c: correc
t
misnamed "
c
a
n
onical" an
d
"res"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Juni
o
C Hama
n
o
s
h
a1_name
.
c: refactor find_short_packed_object()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_name
.
c: rename "now" to
"
curre
n
t"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Jun
i
o C Hamano
sha
1
_nam
e
.
c: clarify
wha
t
"
f
ak
e
" is for in find_
s
h
o
rt_object
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Ha
m
ano
s
ha1
_
name
.
c:
get
rid of get_sha1_wi
t
h
_mode()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C
Hamano
sha1_na
m
e
.
c
:
get rid of get_sh
a
1_with_mode_1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
Sync wit
h
i18n-po update
s
in
m
a
i
nt
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
Junio
C Haman
o
M
e
rg
e
branch '
m
aint' of git://g
i
thu
b
.
c
om
/
git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
sha1_n
a
me
.
c
:
h
i
d
e
get_sha1_wi
t
h_co
n
te
x
t_1() uglines
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
Jun
i
o C Ham
a
no
blame: compute abbreviation width
th
a
t ensu
r
e
s
un
i
q
u
ene
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
a
m
a
n
o
d
i
ff
-
index
.
c
:
"git diff"
h
a
s no
need to read
b
lob
f
ro
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Hamano
diff-index
.
c: u
n
ify handli
n
g of comm
a
nd l
i
ne paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ham
a
no
d
i
f
f
-
i
ndex
.
c:
d
o
n
ot
pretend
paths are pathspecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
m
a
n
o
Third
batch fo
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
i
o
C
H
a
m
ano
Merge
b
ranch
'
fc/gi
t
-prompt-script'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C H
a
ma
n
o
Merge branch
'js/subm
o
dule-re
l
a
t
i
v
e
'
commit
|
commitdiff
|
tree
2012-06-28
J
unio C Hamano
Merge br
a
nch 'lk/more-hel
p
ful-status-hints'
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io C Hama
n
o
M
e
rge branch 'lk/reba
s
e-i-x'
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C Hamano
Me
r
ge bra
n
ch
'j
c
/
re
v
-list-simplif
y
-
m
erges-first-parent'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
Hamano
M
erge bra
n
ch 'h
v
/submodule-u
p
date-nuke-s
u
bmod
u
les'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
H
amano
Merge bra
n
ch 'nd/e
x
clude-workar
o
und
-
top-h
e
avy'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Hamano
Merge branch 'nd/stream-pack-object
s
'
commit
|
commitdiff
|
tree
2012-06-28
J
unio C
Hamano
Merg
e
branch '
n
d/str
e
am
-
index-pack'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C
Hamano
Merge
b
ranch 'mm/verify-
f
ilename-f
i
x'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Haman
o
M
erge branch 'jk/diff-
n
o-index-pager'
commit
|
commitdiff
|
tree
2012-06-26
Junio C Hamano
index-pack: Disable threading
on cygw
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next