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 'tg/ce-namelen-field'
2012-07-24
J
unio
C Hamano
Merg
e
branch
'
t
g/ce-namelen-field'
commit
|
commitdiff
|
tree
2012-07-24
Junio C Ha
m
ano
M
e
r
g
e branch 'nk
/
m
ai
n
t-g
i
tweb-l
o
g-b
y
-lines'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Up
d
ate dr
a
ft release notes to
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Sync with
1
.
7
.
11
.
3
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Haman
o
G
it 1
.
7
.
11
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C Hamano
M
erge bran
c
h 'jk/push-del
e
te-ref-erro
r
-
m
e
ssage' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io C Hama
n
o
Mer
g
e b
r
anch
'
ar/clone-honor-u
m
ask-at-t
o
p' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-22
J
unio C Hamano
M
e
r
ge branch 'cw/amend-commit-
w
ithout-
m
essage' into
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Me
r
ge bran
c
h 'jk
/
maint-commi
t
-
a
mend-only-no-paths'
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio
C Hamano
Mer
g
e
b
ranch 'tg
/
maint-cache-
n
a
me-
c
om
p
are' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-22
J
u
n
io C Hama
n
o
M
e
r
g
e br
a
n
c
h 'tr/
m
ai
n
t-show-walk' into maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C Ham
a
no
Merge
bra
n
c
h 'jc/r
e
factor-
d
iff-stdin'
into mai
n
t
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hama
n
o
Merge bra
n
ch 'mz/empty
-
rebase-tes
t
'
into
maint
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Hamano
Mer
g
e b
r
anch 'j
s
/fast-export-paths-with-s
p
ac
e
s' into
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio
C Hamano
Merge branch 'cw/no-detachin
g
-an
-
u
nborn' int
o
ma
i
n
t
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C Ha
m
ano
Me
r
ge bran
c
h 'vr/use
-
our-perl-in-tests'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C H
a
man
o
Me
r
ge g
i
t://
b
ogomi
p
s
.
o
r
g/git
-
sv
n
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge branch 'jk/revision-wa
l
k
-
stop
-
at
-
max-count'
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io C Hamano
Mer
g
e bra
n
ch 'mm/config
-
xdg'
commit
|
commitdiff
|
tree
2012-07-22
Junio
C H
a
mano
Merge branch 'as/t4012-style-u
p
dat
e
s'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge
bra
n
ch
'pg/maint-1
.
7
.
9-am-whe
r
e-is-patc
h
'
commit
|
commitdiff
|
tree
2012-07-22
Junio C
Hamano
Merge branch 'jl/
m
ai
n
t-1
.
7
.
10-re
c
urse-submodules-wi
t
h
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio
C Hamano
Merg
e
branch 'ms/daemon-doc-
t
yp
o
'
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o C Hama
n
o
Merge branch
'lk/more-h
e
lp
f
ul-status-h
i
nts'
commit
|
commitdiff
|
tree
2012-07-22
Junio C H
a
m
ano
Merge branch 'jc/sha1-name-
m
or
e
'
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o C Ham
a
no
Merge
b
ranch '
j
c/main
t
-fi
l
ter
-
bra
n
ch-epoch-
d
ate'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
H
a
mano
Update draft rel
e
ase notes for 7th ba
t
ch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ham
a
no
Mer
g
e branch 'tg/main
t
-cache-name-compare'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o
C
H
amano
Merge branch 'jk/index-pa
c
k-streaming-f
i
x'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
Hamano
Me
r
ge branc
h
'jk/
m
aint-commit-
a
men
d
-
only-no-pat
h
s'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch
'
c
w/
a
me
n
d-commit
-
wit
h
ou
t
-
me
s
sage'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hamano
Merge branch 'jn/makefile-cl
e
anup'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch
'ar/clone-honor-u
m
ask-at-top'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C Ha
m
ano
Merge branch 'jc/apply-3way'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C
Hamano
Mer
g
e
b
r
anch
'
cw/
r
eb
a
se
-
i-root'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C Hamano
Mer
g
e br
a
n
ch 'pw/git-p4-mo
v
e'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
Merge branch 'pw/gi
t
-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
Merg
e
branch 'jk/pus
h
-delete-r
e
f-error-message'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
S
i
xth batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Ham
a
no
Merge branch
'
jc
/
r
e
factor-d
i
ff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C Ham
a
no
Merge bra
n
ch 'tg/ce-
n
amele
n
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
M
erge branch 'tb/sanitize-deco
m
posed-utf-8-pathname'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merg
e
b
r
anch
'
mm/
m
e
d
iawi
k
i
-
te
s
ts'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hama
n
o
M
erge bran
c
h 'jn/vcs-svn'
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
mano
Merge
branch 'mm/mediawiki-file-attachments'
commit
|
commitdiff
|
tree
2012-07-13
J
unio
C Ha
m
a
n
o
Merg
e
b
ranch 'tr/maint-show-
w
alk'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Hamano
Merge branch 'mz/r
e
base-no-m
b
ox'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C H
a
m
ano
t1512: matc
h
the "ot
h
er" object names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
J
u
ni
o
C Hamano
t7003: add
test to filter a branch
w
ith a commit at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
J
u
n
i
o C Hamano
dat
e
.
c: Fi
x
off by on
e
erro
r
i
n
o
b
ject-header
date
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Ham
a
no
t1512: ign
o
re wh
i
tesp
a
ces in wc
-l outpu
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Haman
o
R
e
duce draft
r
elease notes to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Sync with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
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
aman
o
Me
r
ge branc
h
'
j
c/maint-blame-u
n
ique-ab
b
rev' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
J
uni
o
C Hamano
Merge branch 'r
j
/
platform
-
pread-may-
b
e-thread-
u
nsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
M
e
rge
b
ranch 'th/diff-no-i
n
dex-fixes' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
Merge br
a
nch
'nd
/
clone-
s
ing
l
e-fix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Merge branc
h
'jc/re
v
-list
-
si
m
pl
i
fy-merges-first-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge bra
n
ch 'h
v
/sub
m
odule-u
p
d
a
te-nuke-
s
ubmodu
l
es'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io C Hamano
Merge branc
h
'jk
/
d
i
ff-no-ind
e
x-
p
ag
e
r
' into
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
M
erge
b
r
a
n
ch '
m
m/ver
i
fy-filename-fix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
M
e
r
g
e branch 'c
n
/cherry-
p
i
c
k
-ran
g
e-docs'
i
nto main
t
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
M
e
rge branch
'
jc/ustar-checksum-
i
s-unsi
g
ned' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Me
r
ge branch
'
jc/bundle-complete-
n
otice' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
a
m
a
no
Merge
b
ranch 'jc/ls-fi
l
es
-
i-d
i
r' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
H
amano
M
erge bra
n
ch
'
jc/request-pu
l
l
-
m
atch
-
tagname' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio
C Hamano
Merge branch 'tg/maint-c
a
che-name-comp
a
r
e
' into tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Ham
a
no
cache_name_compare(): do not
truncate while comparing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio
C Ham
a
no
apply: test
s
for
the --
3
way opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C
Hamano
filter-branch: do n
o
t fo
r
get t
h
e '@'
p
re
f
ix to force
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rev-
p
arse --disambig
u
a
te=
<
prefix>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rev-pars
e
: A and B in "r
e
v-parse A
.
.
B" refer to c
o
mmitti
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ham
a
no
reset: th
e
command
t
ake
s
co
m
mitti
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
commit-tree: the comman
d
wants a tree and
c
o
m
mi
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
--build-fake-ancestor
expects blobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_
n
ame
.
c: add s
u
p
port for disambiguat
i
ng other typ
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
revision
.
c: the "log" family, except
f
or "show", takes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
aman
o
revision
.
c: all
o
w
handle_r
e
vision_arg() to take o
t
her
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
sha1_name
.
c: introduce get_sh
a
1_c
o
mmittis
h
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C H
a
m
ano
sha1_name
.
c
:
teach l
o
okup co
n
t
ext to ge
t
_sha1_with_context()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
sh
a
1_n
a
me
.
c
: many s
h
o
rt
n
ames
c
an
o
nl
y
be committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c: get_sha1_
1
() tak
e
s lookup flag
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
sha1_name
.
c: get_des
c
ribe_name() by definition
g
roks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C H
a
mano
rerere
:
m
a
ke rr
-
ca
c
he fanout direc
t
ory h
o
nor umask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
H
a
mano
app
l
y
:
d
o
c
ument --3way opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: allow rerere() to work on --3way results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
aman
o
apply: regis
t
er c
o
nflicted stag
e
s to th
e
index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
a
no
a
p
ply: --3way w
i
th add/
a
dd con
f
lict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply: move verify_i
n
de
x
_m
a
tch() high
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply: plug the three-way merge log
i
c in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
a
no
appl
y
:
fall back on three-way mer
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
a
cc
e
p
t
-3/--3way comma
n
d line opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
app
l
y: move
"
alre
a
dy exists" logic to check_to_cre
a
te()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply: move check_to_create
_
blo
b
() closer
t
o
i
ts sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ha
m
ano
appl
y
: further split load_preimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
Hamano
apply:
re
f
acto
r
"previous patch" logi
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply:
s
pli
t
load_p
r
eimage(
)
helper function out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C Hamano
apply: factor out checkou
t
_target() helpe
r
func
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
a
n
o
a
p
pl
y
: refac
t
or read_file_or_
g
itlink(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next