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
Merge branch 'hv/link-alt-odb-entry'
2012-07-11
Juni
o
C Hamano
Mer
g
e branch
'
jc/ls-files-i-dir' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
i
o
C Hamano
Merge branch '
j
c/request-pull-matc
h
-
tagname' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
M
e
rge
b
r
anch 'tg/maint-cache-n
a
me-compare' int
o
tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
cache
_
name_com
p
are():
d
o not tru
n
cate
while comparin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Haman
o
app
l
y: tes
t
s for th
e
--3
w
a
y option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Ha
m
ano
fi
l
ter-branch: do not forget the '@'
prefix to force
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rev-parse --d
i
sambi
g
uate=<prefix>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
Hamano
r
e
v-parse: A and B i
n
"
r
ev-p
a
r
s
e
A
.
.
B" refer to committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C Haman
o
reset: the comman
d
takes committi
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
commit-tree: the com
m
a
nd wants a t
r
ee and commits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Haman
o
apply: --b
u
i
ld
-
fake-ancestor expe
c
ts blobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c: a
d
d support for disamb
i
g
uating othe
r
t
y
pes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
revisio
n
.
c
: t
h
e "log" f
a
mily,
e
x
ce
p
t for
"
s
h
o
w
", ta
k
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
revision
.
c:
a
llow
h
a
ndle_r
e
v
i
sion_ar
g
() to t
a
ke
o
ther
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
a
no
sha1_name
.
c: intr
o
duce get_sha1_commi
t
t
ish()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
sha1_na
m
e
.
c
: teach
l
ookup contex
t
to get_
s
ha1_with_context()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
sha1_name
.
c: many
s
hort names can only be c
o
mm
i
ttish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
sha1_nam
e
.
c: get_sha1_1() takes lookup fla
g
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
sha1_name
.
c: get_
d
escribe_name() by
d
efini
t
ion
g
roks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Hamano
rerere: ma
k
e rr-ca
c
he fanout
d
irectory honor umask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ha
m
ano
ap
p
l
y
: documen
t
--3way o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ha
m
ano
apply: a
l
low rerere() to
w
ork on --3w
a
y result
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hama
n
o
appl
y
:
register conflicted stages to the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
--3way with add/
a
dd conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
H
a
mano
apply: move verify_in
d
ex_match() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Hamano
apply
:
p
l
u
g the
t
hree-way merg
e
l
o
g
i
c in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
H
aman
o
a
p
ply: fall b
a
ck on three-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C H
a
mano
a
p
p
l
y:
a
cce
p
t -3
/
--3way command line option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
n
o
apply:
m
ove "a
l
ready ex
i
sts" logic
to check_to_create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
a
mano
apply: move check_to_
c
r
e
ate_
b
lo
b
() closer to it
s
so
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
a
ppl
y
:
f
u
rther spli
t
load_preimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
app
l
y: refa
c
tor "previous patch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hama
n
o
a
p
p
l
y: sp
l
it load_p
r
e
i
mage() hel
p
er functi
o
n
out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: f
a
ctor
o
ut c
h
e
ckout_t
a
r
g
et() help
e
r function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply: r
e
factor re
a
d_file_
o
r
_
gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Haman
o
a
p
pl
y
:
clear
_
imag
e
()
clears thing
s
a bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
app
l
y: a bit more comments on PATH_
T
O_BE_DE
L
ETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y: fi
x
an in
c
omplete comment
in ch
e
ck_patch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
Merge git://github
.
com/git-l10n
/
git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Fif
t
h b
a
tch fo
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
a
no
Merge branch 'cw/help-over-network'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Merge b
r
anch 'mz/empty-
r
e
base-test'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
aman
o
Merge br
a
nch 'p
w
/g
i
t-
p
4-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
M
erge
branc
h
'js/fast-export-path
s
-with-sp
a
ce
s
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
Mer
g
e branch 'cw/no
-
d
e
tachin
g
-a
n
-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Me
r
ge b
r
anch 'vr/use-our-perl-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o C Ham
a
no
Mer
g
e branch 'mm/credential-plumbing'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
Merge branch 'jc/m
a
int-blame-unique-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
am
a
no
Merge branch
'
jn/
p
e
r
l-makemake
r
-lea
d
i
ng-paths'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
H
amano
Merge branch 'rj/platf
o
r
m-pread-ma
y
-be-thread-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge bra
n
ch 'mm/co
n
f
i
g-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Ju
n
i
o
C
H
a
mano
Fourth
batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
J
unio C Hamano
Merg
e
b
r
anch 'nd/clone-si
n
gle-fix'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Me
r
ge
b
ranch 'th/diff-n
o
-inde
x
-fix
e
s'
commit
|
commitdiff
|
tree
2012-07-05
Juni
o
C Hamano
Merge
b
ranch
'hv/re
m
ote
-
en
d
-hung-u
p
'
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sh
a
1_
n
ame
.
c: teach get_
s
h
o
rt_sha1() a commit-onl
y
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
s
ha1_n
a
me
.
c: al
l
ow
g
et_short
_
sha1() to take other
flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Ju
n
io C
Hamano
get_sha1(): fix
e
rror status
reg
r
e
s
sion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C Hamano
sha
1
_name
.
c: rest
r
ucture
disambiguation
of
short
names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C
Hamano
s
ha
1
_name
.
c: correct mis
n
amed "can
o
n
ical" and
"
r
e
s"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C Hamano
sha1_name
.
c:
r
efac
t
o
r
find_sho
r
t_pa
c
ked_object()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_n
a
m
e
.
c: rena
m
e "now" to "curre
n
t"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
J
unio C Haman
o
sha1_name
.
c: cla
r
ify what "fake" is for in find_short_obj
e
c
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_n
a
me
.
c: get r
i
d of get_sha1_with_mode()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Jun
i
o C Hamano
sha1_na
m
e
.
c: get
rid of g
e
t_sh
a
1
_
with_m
o
de_1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
Junio C
H
amano
Sync with i1
8
n-po u
p
dates in maint
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
J
u
n
i
o
C Hamano
Merg
e
branc
h
'maint'
of
g
it://
g
ithu
b
.
com/git-
l
10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Junio
C
Hamano
sha1_n
a
me
.
c: hide
g
e
t
_sha1_wi
t
h_context_1() ugliness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
Ju
n
io C Hamano
blame: comp
u
t
e ab
b
reviat
i
on
w
idth that
e
nsures uniqueness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Hamano
diff-
i
ndex
.
c: "git
d
iff" has no n
e
e
d
to read
b
lob from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C H
a
mano
diff-i
n
d
e
x
.
c: unify
handling
o
f
command
l
in
e
paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
diff-in
d
ex
.
c: do not p
r
etend paths are pathspecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Th
i
r
d batch
f
o
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge
branch
'
f
c/git-p
r
ompt-scri
p
t'
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C
H
a
mano
Merge branch 'js/submodule-
r
elative'
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
mano
M
erge b
r
a
n
ch 'l
k
/more-helpful-status-hints'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o
C
Hamano
M
erge branch 'l
k
/rebas
e
-
i
-x
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch 'jc/rev
-
list-
s
implif
y
-
m
e
r
g
e
s-fi
r
st-
p
arent'
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C Hamano
Merge bra
n
ch 'hv/submodu
l
e-upd
a
te-nuke-submodules'
commit
|
commitdiff
|
tree
2012-06-28
J
unio C Hamano
Merge
br
a
nch 'nd
/
e
x
c
l
ude-w
o
rkaround-top-heavy'
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io C Hama
n
o
Merge br
a
nch 'nd/stream-pack-objects'
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C Hamano
Merge branc
h
'n
d
/stream-index-
p
ack'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C
H
a
mano
Merge bra
n
c
h
'mm/verify
-
filename-fix'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge br
a
nch 'jk/diff-
n
o-index-pa
g
er'
commit
|
commitdiff
|
tree
2012-06-26
Junio
C Hamano
index-pack:
Disa
b
le thre
a
di
n
g on cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
J
unio C
H
amano
Se
c
o
n
d batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branch 'lp/no-cmd-http-fetch'
commit
|
commitdiff
|
tree
2012-06-25
J
u
nio C Hamano
Me
r
ge branch
'cn/cher
r
y-pick
-
range-docs'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C
Hamano
Me
r
ge branch 'lm/git-blame-el'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C
Ha
m
ano
Merge branch
'rs
/
ipv6-ss
h
-ur
l
'
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
i
o
C
Hama
n
o
Merge branc
h
'jc/ustar-chec
k
sum-is-unsigned'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Mer
g
e b
r
a
n
ch 'rs/git-blame-mapcar-mapc'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Mer
g
e bra
n
c
h
'
r
r/
d
oc-co
m
mit'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Haman
o
Me
r
ge branch
'
nd/i18n-
m
isc'
commit
|
commitdiff
|
tree
2012-06-25
Junio C
H
amano
Merge b
r
anch '
n
d/i18n-branch-lego'
commit
|
commitdiff
|
tree
2012-06-25
J
u
nio C Hamano
Merge branch 'jk/
n
o-more-asc
i
i
d
o
c
7
'
commit
|
commitdiff
|
tree
2012-06-25
Jun
i
o
C H
a
ma
n
o
Me
r
ge branch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hama
n
o
test-lib: reord
e
r
a
nd include
G
IT
-
BUILD-OPTI
O
NS a lot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C
Hamano
t/RE
A
DME: a
d
d a bi
t
more Do
n
'ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
t
ests: enclose $PERL
_
PATH in d
o
u
ble quotes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next