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 'jv/maint-no-ext-diff'
2012-07-24
Junio C
H
a
mano
Merge
bra
n
c
h '
j
v/maint-no-ext-dif
f
'
commit
|
commitdiff
|
tree
2012-07-24
Junio C Hamano
Merge bran
c
h 'kk/maint-commit-tree'
commit
|
commitdiff
|
tree
2012-07-24
Jun
i
o C Ha
m
ano
Merge
b
ran
c
h
'jk/mediawiki-
c
re
d
ential'
commit
|
commitdiff
|
tree
2012-07-24
Junio C Hamano
Merge branch 'mm/mediawiki-usability
'
commit
|
commitdiff
|
tree
2012-07-24
J
u
n
i
o C
Hamano
M
erge
b
r
anc
h
'sn/do
c
-
typofix'
commit
|
commitdiff
|
tree
2012-07-24
J
un
i
o C Hama
n
o
Merg
e
b
ranch 'tg/ce-namelen-fie
l
d'
commit
|
commitdiff
|
tree
2012-07-24
Junio C H
a
m
a
no
Me
r
ge
b
ranch 'nk/maint-gitweb-log
-
by-lines'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Updat
e
d
r
aft release no
t
es to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C Hama
n
o
S
ync
w
i
t
h
1
.
7
.
1
1
.
3
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Git 1
.
7
.
11
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-22
Junio C Ha
m
a
no
M
e
rge branch 'jk/push-delete-ref
-
erro
r
-mess
a
ge' into
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
J
unio
C Hamano
Me
r
ge branch 'a
r
/clone-ho
n
o
r-uma
s
k
-
at-top' into maint
commit
|
commitdiff
|
tree
2012-07-22
J
uni
o
C Hamano
Mer
g
e branch 'cw/amend-commit-without-message' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Hamano
Merge b
r
anch
'jk/maint-c
o
mmit-amend-only-no-paths'
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o C Hamano
Merge branch '
t
g/maint-
c
ac
h
e-
n
ame-compare' i
n
to main
t
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C Hamano
Merge branch '
t
r/
m
aint-show-walk' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-22
J
u
nio C H
a
mano
M
erge branch
'jc/refactor-diff-stdin' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C
H
amano
Merge branch 'mz/empty-rebase-tes
t
' into
m
ai
n
t
commit
|
commitdiff
|
tree
2012-07-22
Junio C Ham
a
no
Merge branch
'j
s
/fast-
e
xport-paths-
w
ith-spaces'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C
H
am
a
no
Merge b
r
anch 'cw/no-de
t
aching-an-unborn
'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge
b
ranch 'vr/use-o
u
r-
p
e
rl-i
n
-te
s
ts'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C
Hamano
M
erge g
i
t://bogomips
.
o
r
g
/git-svn
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io C
H
a
ma
n
o
Merge branch 'jk/r
e
vision-w
a
lk-stop-at-
m
ax-co
u
n
t'
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o C Haman
o
M
e
rge branc
h
'mm/config-xdg'
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
i
o
C Hamano
Merge branch
'
as/t4012-style-updates'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Mer
g
e
branch
'
pg/maint-1
.
7
.
9
-am
-
where-is
-
patch'
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C Hamano
Merge bran
c
h
'
jl/ma
i
nt-1
.
7
.
10-re
c
u
rse-
s
ub
m
od
u
l
e
s-wi
t
h
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C H
a
mano
M
e
rge br
a
nch 'ms
/
daemo
n
-doc-t
y
po
'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Ha
m
ano
Merge br
a
nch 'lk/more-h
e
l
pful-status-hints'
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Hamano
Me
r
ge branch '
j
c/sha1
-
na
m
e-more'
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o
C
Hama
n
o
M
erge bra
n
ch 'jc/maint-filter-b
r
anch-epoch-
d
at
e
'
commit
|
commitdiff
|
tree
2012-07-18
J
u
nio C H
a
mano
dif
f
: corr
e
ctly
d
isable exte
r
n
al_diff wi
t
h --no-ext
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-17
Junio C
H
amano
Rever
t
"
git-commit-
t
ree
(
1):
u
pda
t
e synops
i
s"
commit
|
commitdiff
|
tree
2012-07-17
Junio
C
Ha
m
ano
M
erge b
r
anch 'kk/maint-1
.
7
.
9-
c
omm
i
t-t
r
ee' into kk/maint
.
.
.
commit
|
commitdiff
|
tree
2012-07-17
Junio C
Ham
a
no
comm
i
t-tree: resurrect comman
d
li
n
e parsing updates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Junio C
H
amano
Update draf
t
rel
e
ase
n
o
tes
for 7th b
a
tch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C
Hamano
Merge bra
n
ch '
t
g/maint-cache-name-compare'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge
b
ranch
'
jk/in
d
ex-pack-stre
a
ming-fix'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch 'jk
/
maint-commit-amend-only-no-pat
h
s'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ha
m
a
n
o
Merge branch 'cw/amend-
c
ommit-without-message'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
H
a
mano
M
erge branch
'jn/makefile-c
l
eanup'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
M
e
r
g
e br
a
n
c
h
'a
r
/clone-honor-u
m
ask-at-top'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C H
a
mano
Merge
br
a
n
ch '
j
c
/
apply-3way'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C Hamano
Merge
b
r
a
nch 'cw/rebase-i-root'
commit
|
commitdiff
|
tree
2012-07-16
Junio C H
a
mano
Merge branch '
p
w/git-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Haman
o
Merg
e
branch 'pw/git-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C
H
amano
Mer
g
e branch 'jk/p
u
sh-de
l
ete-r
e
f
-
err
o
r-
m
e
s
sage'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Ham
a
n
o
S
i
xth batch for 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Haman
o
Merge branch 'jc/re
f
actor-di
f
f-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Hamano
M
erge
branch 'tg/ce-namelen'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge b
r
anch '
t
b/sanitiz
e
-
d
ecompo
s
ed-utf-8
-
p
athname'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io
C
Hamano
Merge branch 'mm
/
mediawi
k
i-test
s
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
a
m
a
no
Mer
g
e bra
n
ch 'jn/vcs-svn
'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Hamano
Merge branch 'mm/
m
edia
w
iki-
f
ile
-
attachments'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hama
n
o
Merge
b
ranc
h
'tr/maint-show-walk'
commit
|
commitdiff
|
tree
2012-07-13
J
u
ni
o
C Hamano
M
erge branch 'mz
/
rebase-no-mbo
x
'
commit
|
commitdiff
|
tree
2012-07-13
J
unio
C
H
amano
t1512: m
a
tch the "other" object names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Juni
o
C Hamano
t7003: add test to filter a branc
h
with
a
commit a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio C H
a
mano
date
.
c: Fix off by one erro
r
in
o
b
ject-header da
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C
Hamano
t1512: ignore
w
hitespa
c
e
s
i
n
wc -l
o
utput
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
H
a
man
o
Reduce draft rel
e
ase notes to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio
C
Hamano
S
y
n
c
w
ith 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C Hamano
G
i
t
1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge b
r
anch 'jc/maint-blame-unique-abbrev'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'r
j
/platform-pread-may
-
be-t
h
read-
u
n
s
afe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C H
a
mano
M
e
rge bran
c
h 'th
/
diff-n
o
-index-fixes' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
e
rge branch
'
nd/clone-
s
i
n
g
l
e
-fix'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch
'jc/r
e
v-list-simplify-merges-firs
t
-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Merge branc
h
'h
v
/
submodule-upd
a
te-nuke-submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge bra
n
ch 'jk
/
diff-no-index-pager' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
M
erge branch 'mm/
v
e
r
ify-filename-fix' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hama
n
o
Merg
e
bra
n
ch
'cn/cherry-pick-range-do
c
s' i
n
t
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
J
uni
o
C
Ha
m
a
no
Merge
branch
'
jc/ustar-checks
u
m
-
i
s-un
s
igned' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jc
/
bundle-c
o
mplet
e
-
notice' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Ha
m
a
no
M
e
rge branch
'
j
c/ls-fil
e
s-i-dir' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C H
a
mano
M
e
rge bra
n
ch
'
jc/requ
e
st-pull-match-tagname' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hama
n
o
M
erge br
a
nch
'
tg/maint-cache-name-co
m
pare' int
o
tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
man
o
cache_name_compare(): do not trunca
t
e
while c
o
mparing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C
Hamano
apply: t
e
st
s
for t
h
e --3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Ha
m
ano
filter
-
branch: do not
f
orge
t
t
h
e '@' prefix to force
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ha
m
ano
rev-parse --
d
is
a
m
biguate=<prefix>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C Ha
m
ano
r
e
v-pars
e
:
A
a
n
d
B
i
n
"rev-
p
arse A
.
.
B" re
f
er to committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
r
eset: the command takes
c
o
m
m
ittish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
commit-tree: the
c
ommand wants a tree an
d
commits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Ham
a
no
ap
p
ly: --build-fake-an
c
estor ex
p
ects bl
o
bs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
sha1_name
.
c: add su
p
port fo
r
disambi
g
uating other
t
ypes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
r
e
vision
.
c: the "l
o
g" fam
i
ly,
e
xcept fo
r
"show", ta
k
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
revision
.
c: allow handle_rev
i
sion_
a
r
g() to ta
k
e other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C H
a
mano
sha1_na
m
e
.
c: i
n
tr
o
duce
g
et_
s
ha1_committish()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
sha1_name
.
c
:
t
each lookup context
to get_sha1_
w
ith
_
con
t
ext()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
s
h
a1_name
.
c: m
a
ny short name
s
can only be com
m
ittish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ha
m
ano
sha1_n
a
me
.
c:
g
et_
s
ha1_1() t
a
kes loo
k
up flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha
1
_name
.
c: get_descr
i
be_name() by
def
i
nition groks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ham
a
no
rer
e
re: m
a
ke rr-cache fan
o
ut directo
r
y
hono
r
umask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C H
a
m
a
no
apply:
d
ocume
n
t --3way o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C
Hamano
a
ppl
y
: all
o
w rere
r
e() to work o
n
-
-
3way results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply: reg
i
st
e
r
c
o
nflicted
stages
to the
index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: --3way wi
t
h add
/
add conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: move verify_i
n
dex_match()
h
igher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
p
ly: pl
u
g
the three-way
merg
e
l
ogic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next