repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mh/maint-revisions-doc'
2012-07-09
Junio C Hamano
revi
s
ion
.
c: al
l
o
w
h
andle_re
v
isi
o
n_arg() to
take other
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_
n
ame
.
c
:
int
r
o
d
u
c
e get_sha1_committ
i
sh()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Hama
n
o
sha1_name
.
c: teach lookup
c
ontex
t
to get_sha1_with_context()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hama
n
o
sha
1
_name
.
c: m
a
n
y
short names can only be committ
i
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
s
ha1_nam
e
.
c: get_sha1
_
1()
t
a
kes look
u
p flags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C H
a
ma
n
o
sha1
_
na
m
e
.
c: get_describe_
n
a
m
e() by defi
n
i
tion
g
roks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
Hama
n
o
r
e
rere: make
rr-cache fanou
t
di
r
ect
o
ry honor
u
m
a
sk
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
apply: docum
e
nt -
-
3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
ano
apply: allow r
e
rere() to
w
ork on --3way results
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
pply: register confl
i
c
ted stages
t
o the index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Hamano
a
p
pl
y
:
-
-3way with a
d
d/a
d
d
con
f
lict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: move verify
_
index_match() higher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C Ham
a
n
o
appl
y
: plug the three-w
a
y m
e
rge logic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ham
a
no
apply:
fall
b
a
ck on
t
hre
e
-way merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C Hamano
ap
p
ly: accept -3
/
--3way command l
i
ne opt
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
a
p
ply: move "already exi
s
ts" lo
g
ic to check_to_create()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply: move check_to_
c
reate_blob
(
) closer to its s
o
le
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
a
no
a
p
ply:
furt
h
er
s
p
lit l
o
ad_pr
e
image()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
Hamano
appl
y
: refactor "prev
i
ous patch" log
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
un
i
o
C
Hamano
a
p
ply
:
s
p
l
i
t
l
o
ad
_
preimage()
h
elper function out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Ham
a
no
apply: fa
c
tor out c
h
eckout_
t
arget(
)
helper function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
app
l
y: refactor re
a
d_
f
i
le_or_git
l
ink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: cl
e
a
r_i
m
age
(
)
c
l
ears things a bit more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
amano
apply: a bit more com
m
ents o
n
P
A
TH_TO_BE_DELETED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
ap
p
ly:
f
ix an incompl
e
te comment
i
n check_patch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
man
o
M
erge git://github
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
Fifth batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
Me
r
ge branch '
c
w
/
help
-
over-networ
k
'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
M
e
rge branch
'
m
z
/empty-rebase-test'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Merge b
r
anch
'
p
w
/git-p4-t
e
sts'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Merg
e
branch 'js/
f
ast-
e
xport-paths-with-space
s
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'cw/no-detachin
g
-an-
u
nborn'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merg
e
branch
'vr/use
-
our-perl-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Merge branch
'
mm/cred
e
n
tial-
p
lumbing'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
H
a
mano
Merge branc
h
'jc/maint-b
l
ame-un
i
q
ue-
a
bbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
M
e
r
g
e br
a
nch 'j
n
/perl-makemaker-lea
d
ing-paths'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Mer
g
e branch
'
rj/platform-pre
a
d-may-be-thre
a
d-
u
nsafe'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ham
a
no
Merge
b
r
anch 'mm/
c
onfig-
x
dg'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Ha
m
a
n
o
F
our
t
h
b
atch f
o
r
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-single-fix'
commit
|
commitdiff
|
tree
2012-07-05
Junio
C
H
amano
M
e
rge branc
h
'th
/
dif
f
-n
o
-i
n
d
ex
-
fixes'
commit
|
commitdiff
|
tree
2012-07-05
Ju
n
i
o
C Hamano
Merge branch 'hv
/
r
e
mote
-
end-hung-up'
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha
1
_name
.
c: te
a
c
h
ge
t
_short_sha
1
(
) a c
o
mmit
-
o
nly o
p
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
J
u
nio C Haman
o
s
h
a1_name
.
c:
a
llow get_short_sha1() to take other flags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
g
e
t_sha1
(
): fix error statu
s
regression
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Juni
o
C Hamano
sha1_n
a
me
.
c: r
e
structure disambiguation of short nam
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C Hamano
s
h
a1_name
.
c: correc
t
misnam
e
d "c
a
n
o
n
ical" and "r
e
s"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Jun
i
o C Hamano
s
h
a
1
_nam
e
.
c:
r
e
factor f
i
nd_short_packed_object()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Ju
n
io C
H
am
a
no
sha1_n
a
me
.
c
:
r
e
n
am
e
"now" to "current"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
J
u
n
io C Hamano
s
ha1_n
a
me
.
c: clar
i
fy what "f
a
ke" is for in find_
s
hort_object
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
J
u
nio C Hamano
sha1_name
.
c:
g
et rid of ge
t
_sha
1
_with_
m
ode()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Ha
m
ano
s
h
a1_name
.
c
:
get rid o
f
g
e
t_sha
1
_with_mo
d
e
_1(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-02
Junio
C Hamano
Sync
with
i
18n-po u
p
dates in mai
n
t
commit
|
commitdiff
|
tree
2012-07-02
Juni
o
C Hamano
M
e
rge bra
n
ch 'maint'
o
f
git://github
.
com/git
-
l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hama
n
o
s
ha
1
_name
.
c: hide get_sha1_with_context_1() uglines
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
blam
e
: compute abbrev
i
ation w
i
dth
t
hat
e
ns
u
res u
n
iq
u
eness
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ha
m
a
no
d
i
f
f-index
.
c: "git dif
f
" has n
o
nee
d
to
read
b
lob fr
o
m
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
Hamano
diff-inde
x
.
c
: unify handling of command line paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
d
i
ff
-
index
.
c: do not pretend paths are path
s
pecs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C
Ha
m
ano
Third
b
atch for
1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Hamano
Merge b
r
anch
'fc/git-prompt-script'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Mer
g
e branch 'js/submo
d
ule-r
e
l
ative'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C H
a
m
a
no
Merge branch '
l
k/mo
r
e-helpful-status-hi
n
ts'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Ha
m
ano
Merge branch
'
l
k/re
b
ase-i
-
x'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch 'jc/rev-l
i
s
t
-
simpli
f
y-
m
erges-firs
t
-
parent'
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io C
H
amano
M
e
rge bra
n
c
h
'
h
v/subm
o
dule-update-nuke-sub
m
odules
'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Hama
n
o
M
erge bran
c
h 'nd/exc
l
ude-
w
orkaround-top-heavy'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
amano
Merge
b
ranch 'nd/stream-pack-
o
bjec
t
s'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
Hama
n
o
Merge b
r
anch 'nd/
s
tream-index-pack'
commit
|
commitdiff
|
tree
2012-06-28
J
u
n
i
o C Hamano
Merge branch '
m
m
/verify-filena
m
e-
f
ix'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch 'jk/diff-n
o
-index-
p
age
r
'
commit
|
commitdiff
|
tree
2012-06-26
Junio C
H
a
m
ano
index-pack: Disable thr
e
adi
n
g
on cygw
i
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Second
b
a
tch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Junio
C
Hamano
Merge
b
ranch 'lp
/
no-c
m
d
-
http-fetc
h
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Haman
o
M
e
rge
bra
n
ch
'
c
n
/ch
e
r
ry-p
i
ck-r
a
n
ge-docs'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branch
'
l
m
/git-blame
-
el'
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
io C Haman
o
M
e
rge branch
'
rs/ip
v
6
-ssh-url'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hama
n
o
Merge branch
'
jc/ustar-checksum-
i
s-u
n
s
i
gned
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merg
e
branch 'rs/git-b
l
a
m
e-m
a
pcar-mapc'
commit
|
commitdiff
|
tree
2012-06-25
J
unio C
Ha
m
ano
Merge branch 'rr/doc-commit'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branch '
n
d/
i
18
n
-m
i
sc'
commit
|
commitdiff
|
tree
2012-06-25
J
unio C Hamano
Merge branc
h
'
n
d/i18n-branc
h
-lego'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hama
n
o
Merge branch 'jk/n
o
-more-a
s
ciidoc7'
commit
|
commitdiff
|
tree
2012-06-25
Junio C
H
amano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
t/
R
EA
D
ME
:
add a bit more Don'ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Junio
C
Hamano
tests:
enclose $
P
E
RL_PATH in dou
b
le quotes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Juni
o
C Hamano
t/t
e
st-lib
.
sh: export PERL_PATH f
o
r us
e
in scr
i
pts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-22
Junio C Ha
m
a
n
o
Merge bran
c
h
'
m
aint'
commit
|
commitdiff
|
tree
2012-06-22
Junio C Hamano
Merge branch
'vr
/
help-per-pl
a
tform'
commit
|
commitdiff
|
tree
2012-06-21
Junio C Ham
a
no
Sy
n
c w
i
th 1
.
7
.
1
1
.
1
commit
|
commitdiff
|
tree
2012-06-21
Junio C Hamano
The first batch
f
o
r
1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-21
J
uni
o
C Ha
m
an
o
G
i
t 1
.
7
.
1
1
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-21
Ju
n
io C Ham
a
no
Merge
b
ranch 'jk/maint-t1304-s
e
tfacl'
commit
|
commitdiff
|
tree
2012-06-21
Junio C Ha
m
a
no
Mer
g
e branch 'vr/help-per-pla
t
form'
commit
|
commitdiff
|
tree
2012-06-21
Junio
C Hamano
Merge branch 'jc/ls-files-i-
d
ir'
commit
|
commitdiff
|
tree
2012-06-21
Junio C H
a
ma
n
o
Mer
g
e bra
n
ch
'
jk/version-strin
g
'
commit
|
commitdiff
|
tree
2012-06-21
J
u
nio C Hamano
Merg
e
b
r
a
n
c
h
'jc/
r
equest-pull-match-
t
agnam
e
'
commit
|
commitdiff
|
tree
2012-06-21
Junio C Ha
m
ano
Merge br
a
nch 'jk/clone-loca
l
'
commit
|
commitdiff
|
tree
2012-06-21
J
u
ni
o
C Hamano
Merge branch
'
jc/
b
undle-complete-notice'
commit
|
commitdiff
|
tree
2012-06-21
J
unio
C
Hamano
K
i
ck
o
f
f
pos
t
1
.
7
.
11 c
y
cle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next