repo.or.cz
/
git
/
jnareb-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
Junio C Hamano
Git 1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Mer
g
e
b
ranch 'jc/maint-blame-unique-abbrev' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
i
o C Haman
o
Me
r
ge bra
n
ch
'
rj/
p
la
t
form-pread
-
m
a
y
-be-t
h
read-
u
ns
a
fe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
b
ranch 'th
/
diff
-
no-inde
x
-
fi
x
es' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
e
rge
branch 'nd/clone-single-fix'
i
nto m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Me
r
ge bran
c
h 'jc/rev-list-
s
implify-merges-firs
t
-
parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
M
erge bra
n
c
h 'hv/submodule-update-nuke-su
b
mod
u
les'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
e
rge branch '
j
k/di
f
f-no-index-pager'
into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Merge bran
c
h 'mm/verify-
f
ilename-fix' i
n
to m
a
int
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio
C Hama
n
o
M
e
rge br
a
nch
'
cn/cherry-pick-range-docs' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
a
mano
Merge branch 'jc/ustar-che
c
ks
u
m-is-unsigned' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
M
erg
e
branch 'jc/bundle-complete-notice' int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
Me
r
ge branch 'jc/l
s
-f
i
les-i-dir' int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Me
r
g
e branch '
j
c/request-p
u
ll-m
a
tch-tagname
'
in
t
o m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Merge branc
h
'tg/maint-cache-name-compar
e
' into
tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
cache
_
n
ame_com
p
are(
)
: do n
o
t
t
run
c
ate while co
m
paring
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Ham
a
no
apply:
t
ests for the --3way op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
filter-br
a
nch: do
not forget
t
he
'
@
'
pre
f
ix to forc
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o C Hamano
rev-pars
e
--disambiguate=<prefix
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
r
e
v-
p
arse: A
a
nd B in "rev-parse A
.
.
B" refer t
o
co
m
m
ittish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
rese
t
: th
e
comma
n
d takes com
m
i
t
t
i
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C
Hamano
comm
i
t
-tree: the command wants a tree and c
o
mmits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
a
no
apply
:
--build-fake-ancestor expects blobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
sha1_
n
ame
.
c: add
s
upport for
disambiguating othe
r
types
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C H
a
mano
revision
.
c: the "log
"
f
amily,
e
x
c
e
pt for "show", ta
k
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C H
a
m
a
no
re
v
ision
.
c: allow handle_revision_arg() to tak
e
o
t
her
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
ama
n
o
sha
1
_nam
e
.
c: intr
o
duce get_sha1_c
o
mmittish()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
s
h
a1_nam
e
.
c
: teach lookup context to get_sha
1
_wi
t
h_context()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o C Hamano
sha1
_
name
.
c: m
a
ny short
n
ames can only be committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
sha
1
_name
.
c
: get_
s
ha
1
_1() takes
lookup flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Haman
o
sha
1
_nam
e
.
c
:
g
e
t_describe_name(
)
by definiti
o
n groks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
rerer
e
: make rr-cache
fa
n
out directory honor umask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C
H
amano
apply: doc
u
m
ent
-
-
3way o
p
ti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
amano
apply: allow rerere() to work o
n
--3way r
e
sults
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ham
a
no
apply
:
register confl
i
cted stages to the inde
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply: -
-
3way w
i
th
a
dd
/
add conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
a
pply: move verify_inde
x
_mat
c
h()
highe
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Haman
o
apply
:
plug the
t
hree-wa
y
merge logi
c
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
Hamano
apply: fall back o
n
t
h
ree-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
apply: acc
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
H
ama
n
o
apply: move "already ex
i
sts" logi
c
to check_to_create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
Hamano
apply: move check_to_create_blob()
clos
e
r t
o
its sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply: further spli
t
l
oad
_
preimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C Hamano
app
l
y: refactor "pr
e
vious pa
t
ch" log
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply: spl
i
t
loa
d
_
pr
e
im
a
ge() helpe
r
f
u
nction out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply
:
fa
c
tor out che
c
kout_t
a
rget() helper
f
u
nc
t
io
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
un
i
o
C Hamano
a
pply: refactor re
a
d
_
f
ile_or_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ham
a
no
apply: clear_
i
mage() cl
e
ars things a bit m
o
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: a
b
it more comm
e
nts on P
A
TH_
T
O_BE_DELE
T
ED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
a
m
ano
apply: fi
x
an incomplete com
m
ent in check_
p
a
t
ch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Mer
g
e g
i
t
:
//
g
ith
u
b
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Fifth batch fo
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge
b
r
a
nch 'cw/he
l
p-over-
n
etwork'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ha
m
ano
Merge
b
ranch 'mz/empty-re
b
a
se-
t
e
st'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
amano
Me
r
ge branch 'p
w
/gi
t
-
p4-
t
ests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
a
no
Merg
e
branch 'js
/
fast-export-paths-with-spaces'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Haman
o
Merge branch '
c
w/no-detaching-an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
mano
Merge branch
'
vr/use-our-perl-
i
n
-te
s
ts'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
ma
n
o
Merge branch '
m
m
/credential-plumb
i
ng'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Haman
o
Mer
g
e
branch
'
jc/maint-blam
e
-unique-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Mer
g
e br
a
nch
'jn/perl
-
m
a
kemaker-leadin
g
-p
a
ths
'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ham
a
n
o
Mer
g
e branch 'rj/
p
l
a
t
form-pread-may-be-th
r
ead-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
Merge br
a
nch
'
mm/config
-
xd
g
'
commit
|
commitdiff
|
tree
2012-07-05
J
u
n
i
o
C
Hamano
F
ourth batch for
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Junio C Haman
o
Merg
e
branch
'nd/c
l
one-s
i
ngle-fi
x
'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Me
r
ge branch
'
t
h
/diff-no-index-fixes'
commit
|
commitdiff
|
tree
2012-07-05
Junio
C
H
a
man
o
Merge bra
n
ch
'
hv/remote-end-hung-up'
commit
|
commitdiff
|
tree
2012-07-03
J
un
i
o C Ha
m
ano
sha1_name
.
c: teach get_short
_
s
h
a
1() a commit-only optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C
H
amano
sha1_name
.
c: allow ge
t
_short_sha1() t
o
t
a
ke other flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
get
_
sha1(): f
i
x error sta
t
us regressio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C Hamano
sha1_name
.
c: restructure d
i
sambi
g
uation of
s
h
or
t
names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C
H
a
m
a
n
o
sha1_na
m
e
.
c: c
o
rrect misn
a
m
e
d "canonical"
a
nd "res"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_na
m
e
.
c
:
refact
o
r find_short_p
a
cked
_
object()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C
H
a
ma
n
o
sha1_name
.
c:
rename "now
"
to "current"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_name
.
c: cl
a
rify what "fake
"
is for in
f
i
nd_short
_
object
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
J
u
n
io C Hamano
sha1_name
.
c: get rid
o
f
get_sha1_wit
h
_mode(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_name
.
c
:
get rid of g
e
t_sha1_with_mode_
1
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
Junio
C Hama
n
o
Sync with i18n-p
o
u
p
dat
e
s in maint
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
Junio C
Hamano
Merge branch
'main
t
' o
f
git:/
/
github
.
com/
g
it-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
J
u
nio C H
a
mano
sha
1
_name
.
c: hide get_sha1_w
i
th_context_1() ugli
n
ess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
Junio
C Hama
n
o
blame: comp
u
t
e a
b
br
e
v
i
ation
w
idth that ensures uniqueness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
diff-index
.
c: "git diff" has no need to rea
d
b
l
ob from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
J
unio C Hamano
d
i
ff
-
index
.
c: unify
handli
n
g of command line
paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ha
m
a
no
diff-index
.
c
: do not
pretend paths are paths
p
ecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
amano
Thi
r
d
b
a
tch fo
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C
H
amano
Me
r
ge branch 'fc/gi
t
-
prompt-scrip
t
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Me
r
ge branch 'js/s
u
bmo
d
ule-relative'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hama
n
o
Merge
b
ra
n
ch 'l
k
/mo
r
e-helpful-st
a
tu
s
-hi
n
ts
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Mer
g
e branch '
l
k
/rebase-i-x'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Hamano
Merg
e
branch
'jc
/
re
v
-
li
s
t-simplify-merges-first-par
e
nt'
commit
|
commitdiff
|
tree
2012-06-28
J
unio
C
Ha
m
an
o
Merge branch 'hv/sub
m
odule-update-nuke-submodu
l
es
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
M
erg
e
branch 'nd/exclude
-
workaround-top-heavy'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Hamano
Merge branch 'nd/strea
m
-pack-objects'
commit
|
commitdiff
|
tree
2012-06-28
J
u
n
i
o C Hamano
Merge bra
n
ch 'nd/stre
a
m-index-p
a
ck'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Me
r
ge branch
'
mm
/
verify-fi
l
ename-f
i
x
'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Haman
o
Merge branch 'jk/diff
-
no-index-page
r
'
commit
|
commitdiff
|
tree
2012-06-26
Junio C Hamano
inde
x
-pa
c
k: D
i
sable thre
a
ding on
cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C
Hamano
Second bat
c
h for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Haman
o
Merge branch 'lp/no-cmd-http-
f
etch'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branch 'c
n
/
c
h
e
r
ry-pick-range-docs
'
commit
|
commitdiff
|
tree
next