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
Git 1.7.12-rc1
2012-07-11
Juni
o
C Hamano
Git 1
.
7
.
1
1
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
J
un
i
o
C
Hamano
Mer
g
e bran
c
h 'jc/main
t
-blame-uniq
u
e-abbrev' into maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C H
a
ma
n
o
M
erge
b
ranch 'rj
/
platform-p
r
ea
d
-may
-
be-thread-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io
C
Hama
n
o
Merge branch 'th/di
f
f-no-index-fixes' int
o
m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C Ham
a
no
M
e
rge branc
h
'n
d
/
c
l
one-si
n
gle-fix' into m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Ham
a
no
M
e
rge
br
a
nch '
j
c/rev
-
list-simp
l
i
f
y-merges-first-
p
a
r
ent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Merge bran
c
h
'
hv/submodule-update
-
nuke-sub
m
od
u
les'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
H
amano
M
erge
branch
'
j
k/d
i
ff-no-index-p
a
ger'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge bran
c
h
'mm
/
verify-f
i
lename-fix'
i
nt
o
ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge branch 'cn
/
c
h
erry-p
i
ck-r
a
nge-docs' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio
C
Haman
o
Merge bra
n
ch
'
j
c
/
u
star-ch
e
cksu
m
-is-
u
ns
i
gned'
into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jc/bundle-comp
l
ete-n
o
tice' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Merge branch 'jc
/
ls-files-i
-
dir' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
a
m
a
no
Merge branch 'j
c
/request-pul
l
-ma
t
ch-tagname' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Mer
g
e branc
h
'tg/maint-cache
-
name-compare' into t
g
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
cac
h
e_name_com
p
a
r
e(): do not truncate whil
e
comparing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Junio
C Haman
o
apply: tests
fo
r
t
h
e
--3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hama
n
o
f
ilter-branch
:
do
n
ot forg
e
t
t
h
e
'
@' prefix to force
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C H
a
mano
rev
-
parse --disamb
i
g
u
ate=<prefix>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
re
v
-parse: A and B in "rev-pa
r
se
A
.
.
B" refer to co
m
mittish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Haman
o
r
eset: t
h
e
command takes c
o
mmittish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hama
n
o
co
m
m
i
t
-tree: th
e
command wants a tre
e
and com
m
its
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
Hama
n
o
a
p
ply: --build-fake-an
c
estor expects blobs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
am
a
n
o
sha1_name
.
c: add
s
up
p
ort for disambiguating other ty
p
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
revision
.
c
: the "log" f
a
mi
l
y
, except
f
or "show", tak
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Hamano
revision
.
c: allow handle_revision_arg()
t
o
take other
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
s
ha1_name
.
c: introduce get_sha1
_
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: te
a
ch looku
p
context
t
o
ge
t
_sha1_with_context(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io
C Hamano
s
h
a
1_
n
a
m
e
.
c:
many short names can only be c
o
mmittish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
sha1_n
a
me
.
c
:
get_sha1
_
1() takes look
u
p flags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
Hamano
sha1_name
.
c
:
get_describe_name() by
d
efinit
i
on grok
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
rer
e
r
e: m
a
ke rr-cache fanout directory honor
u
mask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
appl
y
: document -
-
3way optio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
appl
y
:
allow rerere() to w
o
rk
on --3way re
s
u
lts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ham
a
no
a
p
ply: reg
i
s
ter c
o
nflicted stages to the index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
appl
y
: --3way wi
t
h add/
a
dd confli
c
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
Hamano
apply: mo
v
e verif
y
_index_match() hi
g
her
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C Ham
a
no
apply: plug the th
r
ee-w
a
y merge logic
i
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
a
p
ply:
fall back on three-
w
ay mer
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Ham
a
no
a
p
ply
:
a
c
c
e
pt -3/--3way command l
i
ne option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply:
m
ov
e
"already exis
t
s"
lo
g
ic to
check_to_
c
reate()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Haman
o
ap
p
ly:
move check_to_create_blob() c
l
oser t
o
i
t
s sol
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
a
ppl
y
: further
s
p
lit load_preimage(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: refacto
r
"p
r
evious patch" l
o
gic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
a
n
o
apply: split loa
d
_preimage()
h
elper
functi
o
n
o
ut
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
apply:
fact
o
r out check
o
ut_
t
ar
g
e
t
() helper fu
n
c
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
app
l
y:
refactor read_fi
l
e_or_gitlink
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: clear_image() cle
a
r
s
things a bit more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Ham
a
no
apply: a bit more comments on PATH_TO
_
B
E_DELETED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
apply
:
fix
a
n
incom
p
l
ete comment in
check_pat
c
h
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
Merge git://github
.
com/
g
it-l10n/git-p
o
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Hamano
Fi
f
t
h
bat
c
h for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
M
erge
b
r
anch 'c
w
/hel
p
-over-n
e
twork
'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
Merg
e
bra
n
ch 'mz/empty-reb
a
se-test'
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hama
n
o
Merge branch 'pw/
g
it-p4-t
e
st
s
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
er
g
e
b
ranch '
j
s/fast-
e
x
port-
p
aths-with-spaces'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
M
e
r
ge bran
c
h 'cw/no-detaching-an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Me
r
ge branch 'vr/use-our-perl-in-test
s
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
M
e
r
g
e bran
c
h 'mm/cre
d
ential-plum
b
ing'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Merge b
r
anch 'jc/main
t
-blame-unique
-
a
bbr
e
v
'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hama
n
o
Merge
b
ranch 'jn/perl-
m
akem
a
ker-leadin
g
-paths'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge
branch
'rj
/
pla
t
form-pread
-
may-
b
e-thread-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Ham
a
no
M
e
rge
branch 'm
m
/config-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hama
n
o
Fourth
b
atch 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 Ha
m
ano
Merge branch
'
th/diff-no-index-fixe
s
'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Ha
m
ano
M
erge b
r
anch 'hv/remote-en
d
-hung-up'
commit
|
commitdiff
|
tree
2012-07-03
Junio C Ham
a
no
s
h
a
1_nam
e
.
c: teach
get_short_sha1
(
) a comm
i
t-only option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Juni
o
C Hamano
sha1
_
name
.
c
: allo
w
ge
t
_sho
r
t_
s
ha1() to take
othe
r
flags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
J
uni
o
C Hamano
g
e
t
_sha1(): fix
e
r
ror
stat
u
s regression
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
s
ha1_n
a
me
.
c: restructure disa
m
biguation of short names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Jun
i
o C
Hamano
sha1_nam
e
.
c: correct mis
n
a
m
ed "canonical" and "res"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C Hamano
sh
a
1_na
m
e
.
c: refactor find_short_pack
e
d_obj
e
ct()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_name
.
c:
r
e
name "now" to
"
current"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C
Ha
m
ano
sha
1
_name
.
c: clarify wha
t
"fake" is for in
f
ind_shor
t
_object
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Ju
n
io C Ham
a
n
o
sha1_
n
ame
.
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 Haman
o
sha1_name
.
c: get r
i
d of get_sha1_with_mode_1()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-02
J
u
nio C Haman
o
Sync wi
t
h
i18n-po upda
t
es in maint
commit
|
commitdiff
|
tree
2012-07-02
J
u
nio C Hamano
Merge
b
ranch
'main
t
' o
f
g
it:/
/
github
.
com
/
git-l
1
0n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Ju
n
io C Ham
a
no
sha1_name
.
c: hide get_sha1_with_context_1()
u
gliness
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-02
J
u
n
io C Hamano
blame: compute abbre
v
iation w
i
d
th t
h
at ensure
s
uniqueness
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
diff-in
d
e
x
.
c: "git diff
"
has
n
o nee
d
to re
a
d
blo
b
from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io C Hamano
diff-index
.
c: unify
handling of co
m
m
and line paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Hamano
diff-
i
n
dex
.
c: do not pre
t
e
n
d pa
t
h
s
a
r
e pathspec
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Third
b
atch fo
r
1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C Hamano
Merge branch
'fc/git-promp
t
-scrip
t
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Haman
o
Merge bra
n
c
h
'js/subm
o
dule-
r
elat
i
ve'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Hamano
Merge bran
c
h 'lk/more-hel
p
ful-stat
u
s-hint
s
'
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io C Hamano
M
e
rge b
r
anc
h
'lk/rebase-i-x'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C H
a
mano
Merge branch 'j
c
/rev-list-simp
l
i
f
y-merges-first-parent'
commit
|
commitdiff
|
tree
2012-06-28
J
unio C
Haman
o
Merge branch 'hv/subm
o
dule-upda
t
e-
n
uke-
s
ubmodules'
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C Hamano
M
e
rge branc
h
'nd/excl
u
de-workaround-top-h
e
a
vy
'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Ham
a
no
Merge br
a
nch '
n
d
/stream-pack-
o
bjects'
commit
|
commitdiff
|
tree
2012-06-28
J
unio C Hamano
Merge br
a
nc
h
'nd/st
r
e
a
m
-
index-p
a
ck'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
Ha
m
ano
Merge branch
'
mm/verif
y
-
f
ilename
-
fix'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch 'j
k
/
diff
-
no-
i
ndex-page
r
'
commit
|
commitdiff
|
tree
2012-06-26
Junio C Hamano
index-pack: Disable th
r
eading
on cygwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Junio
C
Hama
n
o
Sec
o
nd batch for
1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
io C H
a
mano
Merge branch 'lp
/
no-cmd-h
t
t
p
-fetch'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge
br
a
nch
'
cn/cherry-pick-ran
g
e-docs'
commit
|
commitdiff
|
tree
next