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 'pg/maint-1.7.9-am-where-is-patch'
2012-07-22
J
unio C Hamano
Mer
g
e
branch 'pg/maint-1
.
7
.
9
-
a
m
-wher
e
-is-patc
h
'
commit
|
commitdiff
|
tree
2012-07-22
J
u
nio
C Hama
n
o
Merge b
r
a
nch
'jl/maint-1
.
7
.
10-r
e
curse-submodules-with
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C H
a
mano
Mer
g
e
b
r
a
nch 'ms/daemon-
d
oc-typo'
commit
|
commitdiff
|
tree
2012-07-22
J
unio C Hamano
Merge branch
'
lk/mo
r
e-helpful-status-hints'
commit
|
commitdiff
|
tree
2012-07-22
J
unio C Hamano
Merge
b
ranch 'jc/
s
h
a
1-name
-
more'
commit
|
commitdiff
|
tree
2012-07-22
Junio C H
a
mano
Merge branch '
j
c/mai
n
t-filter-branch-epoch-date'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C Ham
a
no
Update dra
f
t
rele
a
s
e no
t
e
s
for 7th
batch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C
Ha
m
ano
Mer
g
e branch 'tg/ma
i
n
t-
c
ac
h
e-name
-
compare'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ham
a
no
M
erge branch '
j
k/ind
e
x
-
pac
k
-
streaming-fix'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C Hamano
Merge branch 'jk/maint
-
commit-amend-only-no-p
a
t
hs
'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C Ham
a
no
Merg
e
b
r
anch 'cw/amend
-
commit-without-messag
e
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ha
m
ano
Merge
b
ranch 'jn
/
makefi
l
e-clean
u
p'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C Hamano
Merge bran
c
h
'
ar
/
clone
-
hono
r
-
umas
k
-at-t
o
p'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio
C
H
amano
Mer
g
e branch 'jc/apply-3way'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C H
a
mano
Merge b
r
anch 'c
w
/
r
e
b
ase-i-root
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
H
amano
M
erge bra
n
ch 'pw/g
i
t-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
J
unio C Hamano
Merge bran
c
h 'pw/git-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Haman
o
Merge branch '
j
k/push-del
e
t
e
-ref-
e
rror-mes
s
age'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C H
a
ma
n
o
Sixth bat
c
h for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C
H
a
mano
M
er
g
e branch 'jc/refa
c
tor-diff-
s
tdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Me
r
ge branch 'tg/ce-n
a
melen'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge
b
ranch 'tb/s
a
nitize-
d
ecomposed-utf-8-pathname'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Hamano
Merge bra
n
ch 'mm/media
w
iki-tests'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
ano
Me
r
ge br
a
nch 'jn/vcs-
s
vn'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hama
n
o
Merg
e
branch 'mm/mediawiki-file-a
t
tachments'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io
C Hamano
Merge
b
r
anc
h
't
r
/maint
-
show-walk'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C
Hama
n
o
Merge branc
h
'mz/
r
eba
s
e
-no-mbox'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
t1512:
ma
t
ch
the "other" object names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Hamano
t7003: add test to filter
a
branch w
i
th a commit
a
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Haman
o
date
.
c
: F
i
x off
b
y
o
ne
error
i
n object-header d
a
te
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
t
1
512: ignore whitespaces in
w
c
-
l output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Red
u
c
e draft
release notes
to 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
i
o
C H
a
mano
Sync with
1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio 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 branch 'jc/maint-blame-
u
nique-abbrev' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Haman
o
Merge branch 'rj/platf
o
rm
-
p
r
ead-may-
b
e-thread-unsa
f
e
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
H
a
m
ano
Merge bran
c
h 'th/diff-no-index-fixe
s
' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Haman
o
Merge
b
ranch 'n
d
/clone-single
-
fix' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Haman
o
M
erge bra
n
c
h 'jc/rev-list-simplify-merges
-
first-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'hv/s
u
bmod
u
le-update-nuke-s
u
bmodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Merge bra
n
ch '
j
k/diff-no-inde
x
-pager' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
er
g
e branch
'mm/v
e
rify-file
n
a
me-fix' i
n
t
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Ha
m
an
o
Merge branc
h
'c
n
/cherry-pick-
r
ange-docs' i
n
to
maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io
C
Hamano
Merg
e
branch
'jc/
u
star-chec
k
sum-
i
s-unsigned' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Merge
branch 'jc/bundle-
c
omplete
-
n
otice' into
m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
er
g
e
b
ranc
h
'jc/l
s
-files-i-dir' into main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merg
e
b
r
anch 'jc
/
request-pull-match
-
tagna
m
e' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
cache_name
_
c
o
mpare(): do not truncate whi
l
e com
p
aring
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
J
u
nio C Hamano
apply: tests fo
r
the
--3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
filter-branch: do not f
o
rget the
'
@' prefix to
f
o
rce
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
rev-parse --
d
isa
m
bigu
a
te=<prefix>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rev-par
s
e:
A an
d
B in "rev-
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
u
nio C H
a
mano
reset: the command takes com
m
ittish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
am
a
no
commit
-
tree
:
t
he command wants a tree and com
m
its
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
apply: --build-fake-an
c
estor
e
x
pects blob
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
Ham
a
no
sha1_na
m
e
.
c: add support for disambig
u
ating other type
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
revision
.
c: the "log"
family, exc
e
pt for "show",
t
a
kes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rev
i
sion
.
c
:
allow h
a
ndl
e
_
r
evision_arg
(
) to
t
ake ot
h
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
sha1_name
.
c:
i
ntroduce get_sha1_
c
ommittish()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c
:
teach
loo
k
up context
to
g
et_sha1_wit
h
_context()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
sh
a
1_nam
e
.
c
:
ma
n
y
short n
a
mes can only
b
e
commi
t
t
i
s
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o C Hamano
sha1_name
.
c: ge
t
_sha1_1() take
s
loo
k
up flags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Haman
o
sh
a
1_name
.
c: get_describe_name()
b
y
defin
i
t
ion groks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
ano
rer
e
re: make rr-cac
h
e fanout directory honor umask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
app
l
y
:
document --3
w
ay option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
Ham
a
no
apply: all
o
w rerere() 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:
r
e
g
is
t
er c
o
nflicted stag
e
s
to
t
h
e
inde
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C H
a
m
ano
apply: --3
w
ay with ad
d
/add conflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
ap
p
ly: move verify_in
d
ex
_
ma
t
c
h
() higher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C H
a
m
a
no
apply: plug the three-way m
e
rge logic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
H
amano
ap
p
ly: fall ba
c
k on th
r
ee-way merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ham
a
no
a
pply: ac
c
ept -
3
/-
-
3w
a
y
comma
n
d line option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply: move "already exists"
logic to ch
e
ck_to_crea
t
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: move ch
e
ck_to
_
create_blob() clo
s
er to i
t
s sol
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
app
l
y: further
split
load_preima
g
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
a
pply: refactor "previo
u
s patch" logi
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: spli
t
l
oad_pr
e
i
m
age()
h
elper func
t
ion out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
appl
y
: factor
o
ut checkout_tar
g
et(
)
helper function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
appl
y
:
refactor read_file_or_
g
itlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
a
pply: clear_
i
mage
(
)
c
lears
things a bit mor
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hama
n
o
apply
:
a bit more co
m
ments o
n
PATH_TO_BE_DELETED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply: fix an
incomplete comment in check_pa
t
c
h
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C H
a
m
a
no
Merge git:
/
/
github
.
com/git-l
1
0n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Hamano
F
i
fth batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
M
e
rge branch 'cw/help-over-ne
t
wor
k
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hama
n
o
Merg
e
br
a
nch 'mz/empt
y
-
rebase-tes
t
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge
branch 'pw/git
-
p4-te
s
t
s
'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
Me
r
ge b
r
anch 'j
s
/fast-expo
r
t-path
s
-with-spaces'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
H
am
a
no
Merg
e
br
a
nch 'cw/
n
o-detaching-an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
H
a
m
a
no
Merge branch
'
vr/use-o
u
r-
p
erl-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merg
e
bran
c
h 'mm/credential-plumb
i
n
g
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
e
r
g
e
b
ran
c
h
'
jc/maint-blame-u
n
iq
u
e-ab
b
re
v
'
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
Merge
bran
c
h '
j
n/perl-makemake
r
-leading-paths'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C H
a
man
o
M
erge
b
ranch 'r
j
/platform-prea
d
-may-be-thread
-
unsafe
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Merge br
a
n
c
h 'mm/
c
onfig-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Junio C
H
a
m
ano
Fourth batch for 1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Juni
o
C
Ha
m
ano
M
e
r
g
e
branch
'nd/clone-s
i
ngle-fix'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge branc
h
'
t
h/dif
f
-
no-index-fixes'
commit
|
commitdiff
|
tree
2012-07-05
Juni
o
C Hamano
Merge
b
r
anch 'hv/r
e
mote-e
n
d-h
u
ng-up'
commit
|
commitdiff
|
tree
2012-07-03
Junio
C
Hamano
s
ha1
_
name
.
c: teach get_short_sha1()
a commit-o
n
ly opti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next