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 branch 'rr/git-uri-doc' into maint
2012-07-09
Junio C
H
amano
sha1_name
.
c: te
a
ch
l
ookup context to get
_
sh
a
1
_
with_cont
e
xt
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
s
ha1_name
.
c: many short na
m
es can only
be committi
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
s
ha1_n
a
me
.
c: get_sha1_1()
t
ak
e
s
lookup flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_n
a
me
.
c: get
_
desc
r
ib
e
_nam
e
(
)
by def
i
nition groks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
re
r
ere: make rr-cache fanout
direc
t
o
ry honor
uma
s
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
app
l
y:
document -
-
3way
o
p
ti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ham
a
no
apply:
allow rerer
e
() to work on --3way results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
apply: registe
r
conflicte
d
stages to the inde
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ha
m
ano
apply: --3way
with add/add confli
c
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply: mov
e
v
e
r
ify
_
index_m
a
tch()
hi
g
her
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
appl
y
:
p
l
u
g
the three-w
a
y merg
e
logi
c
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
Hamano
app
l
y: fall back on
t
hree-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
apply: accept
-
3
/--
3
way com
m
and line option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Ha
m
ano
a
p
p
l
y:
m
o
v
e "already exists
"
logic to check_to
_
create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o
C Hamano
apply: move c
h
eck_to_create_blob()
closer to its sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
app
l
y: further split load_
p
reimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: refactor "p
r
evious patch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
a
p
ply: split load_preimage() helper
f
unction out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply:
f
a
c
tor out che
c
kout_
t
ar
g
et() helper function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: refactor read_file_or_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hama
n
o
a
p
ply: clear_image() clears things a bi
t
more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: a bit more
comments on PATH_TO_BE_DELETE
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
ap
p
l
y
:
f
ix
a
n
i
ncomp
l
e
te
comm
e
nt in ch
e
ck_patch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
Hamano
Merge
git://githu
b
.
co
m
/g
i
t-l10n/git-p
o
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Ham
a
n
o
F
ifth
ba
t
ch fo
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Mer
g
e bran
c
h 'cw/h
e
l
p-ov
e
r
-net
w
ork'
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C Hamano
Mer
g
e branch 'm
z
/emp
t
y-rebase-te
s
t'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
a
n
o
Me
r
ge branch 'p
w
/git-p4-tests'
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
Me
r
ge branch 'js/fast-export-path
s
-with-space
s
'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
M
e
rge br
a
nch
'
cw/no-detachin
g
-a
n
-unbo
r
n
'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Me
r
ge branch 'v
r
/us
e
-
o
ur-per
l
-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Me
r
ge branch 'mm/c
r
edential-plumbing'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'jc/maint-blame-uniq
u
e-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
Haman
o
Me
r
ge branch 'jn/p
e
r
l
-mak
e
m
aker-lea
d
ing-p
a
t
h
s'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hama
n
o
Merge branch 'rj/plat
f
orm-p
r
e
a
d-may-
b
e-
t
hr
e
a
d
-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
M
erge bran
c
h 'mm/conf
i
g
-
xdg'
commit
|
commitdiff
|
tree
2012-07-05
Junio C H
a
m
a
no
Fourth batch 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
a
n
o
Merge b
r
anch 'n
d
/cl
o
ne-single-f
i
x'
commit
|
commitdiff
|
tree
2012-07-05
Juni
o
C Hamano
M
erge branch 't
h
/diff-no-index-f
i
xes'
commit
|
commitdiff
|
tree
2012-07-05
Junio C
H
amano
Merge branch 'hv/r
e
mote-
e
nd
-
hung-u
p
'
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hama
n
o
sha1
_
na
m
e
.
c
: t
e
ach get_shor
t
_sha1() a commit-o
n
ly option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Juni
o
C Hamano
s
h
a1_name
.
c: allow get_s
h
ort_sha1() to take other fla
g
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
J
unio C Ham
a
no
g
e
t
_
s
ha1():
f
i
x
error
status regressi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C
H
ama
n
o
s
h
a
1_na
m
e
.
c:
r
estructure disa
m
big
u
ation of short names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C
Ha
m
ano
sha1_name
.
c: cor
r
ect misname
d
"c
a
nonical"
and "res"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_name
.
c: refactor
find_shor
t
_pa
c
ked
_
object()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hama
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 H
a
mano
sha1_name
.
c
: c
l
arif
y
what
"
fake" is
for i
n
find_sho
r
t
_object
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Haman
o
sha1_name
.
c: get rid of g
e
t_
s
h
a
1
_
with_mode()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
s
h
a1_name
.
c: get rid
of get_sha
1
_wi
t
h_mode_1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
J
u
ni
o
C Hamano
Sync with i18n-po u
p
dates in mai
n
t
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
Junio C
H
amano
Merg
e
branc
h
'maint' of git:
/
/github
.
com/gi
t
-
l10n/
g
it
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Juni
o
C Hamano
s
h
a1_name
.
c: hide get
_
sha1_with_context_1()
ugl
i
ness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
Ju
n
io C Hamano
bla
m
e: compute abb
r
evia
t
ion width that
ensures uniquene
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
diff-index
.
c: "git d
i
ff" has no need to read blob from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C
Hamano
diff-index
.
c: unify ha
n
dling
of command line paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
i
o
C
Hamano
diff-index
.
c: do
not pretend pat
h
s
are pathspecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Hama
n
o
Third ba
t
ch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ha
m
a
n
o
Merge
branc
h
'fc/g
i
t-promp
t
-script'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Hamano
M
erge branch 'js/
s
ubmod
u
le-r
e
lative'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ha
m
a
no
M
e
r
g
e branc
h
'lk/more-h
e
lpful-sta
t
us-hints'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C
H
amano
Merge
b
ranch 'lk/rebase-i-x'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
am
a
no
Merge branch 'jc/rev-list-si
m
plify-merges
-
f
i
rst-parent'
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
mano
Merge
bra
n
ch
'
hv/subm
o
dule-upd
a
te-nuk
e
-submodul
e
s'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge bran
c
h 'nd/exclude-workaround-to
p
-heavy'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge
b
r
anch
'
nd/stream-pa
c
k
-
o
b
je
c
ts'
commit
|
commitdiff
|
tree
2012-06-28
J
u
n
io C Hama
n
o
M
e
r
g
e b
r
an
c
h
'
nd/stream-in
d
ex-pack'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
a
mano
Merg
e
bra
n
ch 'mm/verify-filename-fix'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch 'jk/diff
-
n
o
-in
d
ex-pager'
commit
|
commitdiff
|
tree
2012-06-26
J
u
n
io C Hamano
index-p
a
ck
:
D
isable threa
d
i
n
g on cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Jun
i
o
C H
a
mano
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 Ha
m
ano
Merge branch 'lp/
n
o-
c
md-ht
t
p-fetch'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hama
n
o
M
erg
e
b
r
anch 'cn/cherry-p
i
ck-ra
n
ge-docs'
commit
|
commitdiff
|
tree
2012-06-25
J
un
i
o C Ham
a
no
Me
r
g
e branch 'l
m
/git-
b
lame-el'
commit
|
commitdiff
|
tree
2012-06-25
J
u
nio C Hamano
Merge branch '
r
s/
i
p
v6-ssh-url'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Me
r
ge branch 'jc/u
s
tar-checksum-is-unsi
g
ned'
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
io C Hamano
M
e
rge br
a
n
c
h 'rs/git-blame-mapcar-mapc'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branch
'
rr/doc-com
m
it'
commit
|
commitdiff
|
tree
2012-06-25
Juni
o
C Hamano
Merge b
r
a
n
ch 'nd/i18n-misc'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Me
r
ge branch 'nd/i1
8
n
-branch
-
lego'
commit
|
commitdiff
|
tree
2012-06-25
Jun
i
o
C Hamano
Me
r
ge branch 'jk/no-more-ascii
d
oc7'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C
Hama
n
o
Merge br
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2012-06-25
J
u
nio C Hamano
t
est
-
lib: reorder and
i
nclude GIT-BUILD
-
OPTIONS a lot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
io
C H
a
mano
t/README:
a
d
d
a bit mor
e
Don'ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
io C Hamano
tests: enclose $
P
ERL_P
A
TH in double quotes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
t/test-lib
.
sh: export PERL_PATH for use i
n
script
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-22
Junio C Hamano
M
erge bra
n
ch 'maint
'
commit
|
commitdiff
|
tree
2012-06-22
Junio C Hamano
Merge branch '
v
r
/help-per-platform'
commit
|
commitdiff
|
tree
2012-06-21
Junio C
Haman
o
Sync
with
1
.
7
.
11
.
1
commit
|
commitdiff
|
tree
2012-06-21
Ju
n
io C Hamano
T
h
e f
i
rst batch fo
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-21
J
unio C Ha
m
an
o
Gi
t
1
.
7
.
11
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-21
J
u
nio C H
a
m
a
no
Merge branc
h
'
j
k/maint-t1304-setfacl'
commit
|
commitdiff
|
tree
2012-06-21
Jun
i
o C Hamano
Merg
e
branch 'vr/hel
p
-
per-platform'
commit
|
commitdiff
|
tree
2012-06-21
Ju
n
io
C Haman
o
Merge branch 'jc/ls-file
s
-i-di
r
'
commit
|
commitdiff
|
tree
2012-06-21
J
unio C
H
a
mano
Merg
e
br
a
n
ch '
j
k/vers
i
on
-
strin
g
'
commit
|
commitdiff
|
tree
2012-06-21
J
u
ni
o
C Hamano
Merge b
r
anc
h
'jc/
r
eques
t
-pu
l
l-match-
t
a
g
na
m
e'
commit
|
commitdiff
|
tree
2012-06-21
Junio C H
a
mano
Me
r
g
e
branc
h
'jk/clone-loc
a
l
'
commit
|
commitdiff
|
tree
2012-06-21
Junio C Hamano
Merge b
r
anch
'
j
c/bund
l
e-com
p
lete-n
o
ti
c
e'
commit
|
commitdiff
|
tree
2012-06-21
Junio C Hamano
Kick of
f
post
1
.
7
.
1
1
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-19
Junio C
H
a
mano
s
h
ow:
f
ix "range
im
p
lies walk
i
ng"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next