repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'as/t4012-style-updates'
2012-07-22
Junio C H
a
mano
Merge bran
c
h 'as/t4012-style-upda
t
es'
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o C Haman
o
M
erge branch 'pg/m
a
int-1
.
7
.
9-
a
m-w
h
ere-is-p
a
t
c
h'
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o C Hamano
Merge branch 'j
l
/maint-1
.
7
.
10-recu
r
se
-
submodules-wit
h
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
J
unio C Hamano
Me
r
ge
b
ranch 'ms/daemon-doc-t
y
p
o'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
M
e
rge
branc
h
'lk/mo
r
e-helpful-status-hints'
commit
|
commitdiff
|
tree
2012-07-22
J
unio C Ham
a
no
Me
r
ge branch 'j
c
/
s
h
a1-name-more'
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o C Hamano
Merge b
r
anch
'jc/main
t
-filt
e
r-branch-
e
p
o
ch-date'
commit
|
commitdiff
|
tree
2012-07-16
J
un
i
o
C
Hamano
Update draf
t
r
el
e
a
s
e
n
otes f
o
r
7
th batch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
J
unio C
Haman
o
Merge branch 't
g
/
m
a
i
nt-cac
h
e-
n
ame-c
o
mpare'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge bra
n
c
h
'jk/index-pack-st
r
ea
m
in
g
-fix'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
Hamano
Merge bran
c
h 'jk/maint-c
o
mmit-amend
-
only-no-paths'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C
H
amano
Merge branc
h
'
c
w/ame
n
d-commit-without-message'
commit
|
commitdiff
|
tree
2012-07-16
J
u
n
i
o C Hamano
Merge bra
n
ch
'
jn/makefile-cle
a
nup'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Ham
a
no
M
e
r
ge
branch 'ar
/
clone-honor-umask-at-top'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Me
r
ge branch '
j
c/a
p
ply-
3
way'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ha
m
ano
Merge branch 'cw/rebase-i-root'
commit
|
commitdiff
|
tree
2012-07-16
J
un
i
o
C Ham
a
no
Me
r
ge branch
'pw/g
i
t-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
J
uni
o
C
Hamano
Merge br
a
nch 'p
w
/git-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
Merge br
a
nch 'j
k
/push-delete
-
ref-e
r
ror-message'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C
Hamano
S
i
xth batc
h
for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Hamano
Mer
g
e
b
r
anch 'jc/refactor-diff-s
t
din'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch 'tg/ce-nam
e
l
en'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge b
r
a
n
ch 'tb/sanitize-decomposed
-
utf
-
8-pathname'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ham
a
n
o
M
erge branch
'm
m
/
mediawiki-tests'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ham
a
no
Merge b
r
an
c
h 'jn/vc
s
-svn'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Hamano
Merge
b
ranch 'mm/mediawiki-file
-
a
t
t
achm
e
nts'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merg
e
branc
h
't
r
/m
a
int-show-
w
alk
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch 'm
z
/reb
a
se-no-
m
box'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
H
a
m
a
n
o
t
1
512: match
t
he "other
"
objec
t
names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Hamano
t7003: add te
s
t
to
f
il
t
er a branch wit
h
a commit at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Ha
m
ano
date
.
c: Fix off by o
n
e
erro
r
in object-header date
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
t
1
512: ignore whitespaces in wc
-
l
o
ut
p
ut
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Reduce
d
r
a
ft re
l
e
a
se
n
otes to 1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Ha
m
ano
Sync
w
i
t
h
1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Gi
t
1
.
7
.
1
1
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
a
mano
Merg
e
branch 'jc/maint-blam
e
-un
i
que-abb
r
ev' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
Merge branch 'rj/p
l
atform-pread-may-be-thread-unsaf
e
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Merge branch 'th/d
i
ff-no
-
i
n
d
e
x
-
fixes' i
n
to
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Haman
o
Merge
b
ranch
'nd/clone-single-
f
i
x' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
b
ranch 'jc/rev-list-s
i
mplify-merges-first
-
p
a
re
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Merge branch
'hv
/
submodule
-
updat
e
-nuke-submo
d
u
l
es'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
erge br
a
nch
'
jk
/
diff-n
o
-index-pager' into m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge b
r
anch 'm
m
/verify-filename-f
i
x' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
a
n
o
Me
r
g
e branch 'cn/cherry-pick-range-doc
s
' into maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Ham
a
no
Mer
g
e
br
a
nc
h
'j
c
/
ustar
-
checksum-is-unsigned' in
t
o m
a
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Haman
o
Merge bran
c
h
'
jc/bundle-complete-not
i
ce' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Merge
bra
n
ch 'jc/ls-files
-
i-dir' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch
'
jc/request-pull-matc
h
-tag
n
ame' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
cache_
n
ame_compare():
d
o not
truncate while comparing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Jun
i
o C Ham
a
no
a
p
ply
:
tests for the --3way op
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Ham
a
no
filter-bra
n
ch: do no
t
forget the '@'
p
refix to force
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
rev-p
a
rse --disambiguate=<prefix>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Ham
a
no
r
e
v-parse: A and B in "
r
ev-
p
arse A
.
.
B" refer to committish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
reset:
the comm
a
nd takes com
m
i
t
tish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
com
m
it-tree:
t
h
e command wants a tree and commi
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
H
am
a
n
o
ap
p
ly
:
-
-build-fake-ancesto
r
expects blobs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
ano
sha1_name
.
c: a
d
d support for disambi
g
uating other types
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
revi
s
ion
.
c
:
th
e
"log" fami
l
y, excep
t
for
"
s
how", takes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
revision
.
c: al
l
o
w
handle_
r
evision_ar
g
()
t
o ta
k
e other
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
Hamano
sha1_name
.
c:
intro
d
uce get_sha
1
_
c
o
mm
i
ttish()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_nam
e
.
c:
te
a
c
h
loo
k
up context to get_
s
ha1_wi
t
h_context()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
H
aman
o
s
h
a1_name
.
c: many
s
hort n
a
mes can only be committish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c: get_s
h
a1_1() takes lookup flags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
sha1_
n
ame
.
c: get_de
s
cribe_
n
am
e
() by
d
efin
i
t
io
n
g
roks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Haman
o
rerere: make rr-c
a
c
h
e fanout direc
t
o
r
y honor umask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply: docume
n
t
--3
w
ay
op
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Ha
m
ano
apply: allow r
e
rere
(
) t
o
work on
-
-3way results
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C Hamano
apply: regi
s
ter conflicted sta
g
es to
the index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o C H
a
man
o
apply: --
3
wa
y
with add/add co
n
flict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hama
n
o
ap
p
l
y: move verif
y
_index_
m
atch() higher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ham
a
n
o
ap
p
ly: plug the three-way merge logic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Hama
n
o
apply:
fall back on three-way merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
apply
:
acce
p
t -3/--3way command
line option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ha
m
ano
app
l
y: move "
a
lr
e
ad
y
e
xists" logic
to c
h
eck_to_create()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
p
ly: move
c
heck
_
to_create_blob(
)
cl
o
ser to its s
o
le
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C Ha
m
a
n
o
a
pply: further split load_
p
reimage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hama
n
o
apply:
refactor "previous 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
a
p
ply:
s
plit load_preim
a
ge(
)
h
e
l
per function out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: factor out c
h
e
c
k
o
ut_t
a
rget() helper fu
n
ction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C Hamano
a
p
ply:
r
e
f
actor r
e
a
d
_file_o
r
_git
l
ink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: clear_image() cl
e
ars things a
b
it mor
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
a
bi
t
m
o
re
comme
n
ts o
n
PAT
H
_TO_BE_DELE
T
ED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: fix
an
i
ncom
p
lete c
o
mment in check_patch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
a
no
M
e
rge
g
it:
/
/github
.
c
o
m
/git-l10n/g
i
t
-po
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Fift
h
ba
t
ch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
ano
Me
r
g
e
br
a
n
ch 'cw/help-over-netw
o
r
k'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
am
a
no
Merge branch 'mz/empty-rebase-t
e
st'
commit
|
commitdiff
|
tree
2012-07-09
J
un
i
o C Hamano
Merge branch 'pw/git-p4-tes
t
s'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
Merge
branch 'js/fast
-
export-paths-wit
h
-spac
e
s'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
amano
Merge
b
ranch 'cw
/
no-detachin
g
-an-u
n
born'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
Mer
g
e branch '
v
r/use-o
u
r-p
e
rl-i
n
-tests'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ham
a
no
Merge bran
c
h 'mm/creden
t
ial-
p
l
umbing'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
amano
Merge branch 'jc/maint
-
blame-unique-abb
r
ev'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ha
m
a
n
o
Merge branch 'jn/pe
r
l-makemaker-
l
e
ad
i
ng-pa
t
hs'
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Ham
a
no
Merg
e
b
r
anch 'rj/
p
latform-pread-
m
ay-be-thread-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
M
e
r
ge branch 'mm/config-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Junio C
H
amano
Fo
u
rth batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Juni
o
C
H
a
mano
Mer
g
e branch 'nd/
c
lone
-
single-fix'
commit
|
commitdiff
|
tree
2012-07-05
Ju
n
io
C Hamano
Me
r
ge bra
n
ch '
t
h
/
dif
f
-no-ind
e
x-fixes
'
commit
|
commitdiff
|
tree
2012-07-05
Ju
n
io C Hamano
M
er
g
e branch 'hv/remote-end-h
u
ng-up'
commit
|
commitdiff
|
tree
next