repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
attr: failure to open a .gitattributes file is OK with ENOTDIR
2012-07-18
J
unio C Hamano
diff: correctly disa
b
l
e
ex
t
ernal_diff with
-
-no-ext
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-17
J
u
nio C Ham
a
no
R
evert "git-
c
ommit-tree(1): up
d
ate s
y
nopsis"
commit
|
commitdiff
|
tree
2012-07-17
J
u
ni
o
C
Ha
m
ano
Merge branch 'kk/m
a
i
nt-1
.
7
.
9-commit-t
r
ee' int
o
kk/mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-07-17
Ju
n
io C
H
am
a
no
c
om
m
it-tree: resurrect comman
d
li
n
e parsin
g
u
pdates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Updat
e
draft release notes f
o
r 7th batch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch 'tg/mai
n
t
-
c
ac
h
e-
n
a
me-compare'
commit
|
commitdiff
|
tree
2012-07-16
Junio C H
a
man
o
Mer
g
e bran
c
h 'jk/
i
ndex-pack-streaming-fix'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
H
amano
Merge branch 'jk/m
a
int-commit-amend-only-no-
p
aths'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
H
a
m
ano
Merge branch 'cw/a
m
end-c
o
m
mit-without-messa
g
e'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hamano
Merge branch
'
jn/mak
e
file-clean
u
p'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ha
m
ano
Me
r
g
e
branch 'ar/clone-h
o
nor-umask
-
at-top'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C Hamano
Merge
bra
n
ch 'jc/
a
pply-
3
wa
y
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch 'cw/reb
a
se-i-root'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge
branch 'pw/g
i
t-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Jun
i
o C
Hamano
Merge branch 'pw/gi
t
-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio
C Hama
n
o
Merge branch
'jk/pus
h
-delete-ref-e
r
ror
-
message'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Haman
o
Si
x
th batch for
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio
C
Hamano
Merge
branch 'jc/refactor-diff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge
b
ran
c
h 'tg/ce-namel
e
n'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Hamano
Merge bran
c
h
't
b
/sanitize-deco
m
posed-utf-8
-
p
a
thname'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C
Ham
a
no
Merge
br
a
nch 'mm/mediawiki-te
s
ts'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch 'jn/vcs-svn'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
M
e
r
ge branch 'mm/mediawiki-file-attachmen
t
s'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Me
r
ge branch '
t
r/ma
i
nt-show-walk'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o
C
H
aman
o
Me
r
ge branch
'
mz
/
rebase-no
-
mbox'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
t
1512:
m
atch
the "othe
r
" o
b
ject nam
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Ju
n
io
C
Hama
n
o
t700
3
: add
test t
o
filter a branch
wit
h
a com
m
i
t at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Jun
i
o C
Hamano
date
.
c: F
i
x of
f
b
y one error in
o
bje
c
t
-
h
e
ade
r
date
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
unio C
H
a
m
ano
t
151
2
: ignore whit
e
spaces in wc -l output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Ham
a
no
Reduce draft re
l
ease note
s
to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Sync with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
am
a
no
Gi
t
1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Merge branch 'jc/maint-blame-uni
q
u
e-abbrev' into
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Me
r
ge
b
r
anc
h
'rj/platform-pread-may-be-thread-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branc
h
'th/
d
if
f
-no-index-f
i
xes' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hama
n
o
M
e
rge
b
ran
c
h 'nd/c
l
one-single-fix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
i
o
C Hamano
Me
r
ge branch 'jc/re
v
-list
-
sim
p
lify-merge
s
-first-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Merge branch
'
hv/subm
o
du
l
e-update-nuke
-
submodules
'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
n
o
M
e
rge br
a
nch 'jk/
d
i
f
f
-no
-
index-pager
'
in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Ham
a
no
Mer
g
e
bra
n
ch 'mm/verify-
f
i
lename-f
i
x' into main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch
'cn/
c
herr
y
-
pick-range-
d
ocs' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Merge
branch 'jc/ustar-
c
h
e
c
ksum-is-unsigned' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C H
a
mano
Me
r
g
e
b
r
a
nch 'jc/bundle
-
comp
l
ete-notice'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
H
aman
o
Merge branch 'jc/l
s
-file
s
-i-
d
ir' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
Merge branch 'jc/req
u
est-pull
-
match-ta
g
name' into
mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C
Hamano
Merge
b
ra
n
ch 't
g
/maint-
c
ache-
n
ame-compare' int
o
tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
cache_name_compare
(
)
: do not
t
r
uncate while comparing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Haman
o
a
pply: tests for the --3
w
ay option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
J
u
nio C Hamano
filter-b
r
anch: do not f
o
rget the '@' prefix to force
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
r
ev-par
s
e
--
d
isambiguate=<prefix>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
H
amano
rev-parse: A and B in "rev-parse A
.
.
B" r
e
fer to comm
i
ttish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
r
eset: the command takes committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
commit-tree: th
e
com
m
and wants a tree and commits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
a
no
apply: --build-
f
ake-ancest
o
r ex
p
ect
s
b
l
o
b
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
H
amano
s
ha1_n
a
me
.
c
: add support for disambiguating other typ
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
revis
i
on
.
c:
the "
l
og" family,
e
x
cept for "show", t
a
ke
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
Hamano
r
e
v
i
sion
.
c: allow handle_revi
s
ion_arg() to
t
a
k
e
other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Hama
n
o
s
h
a1_na
m
e
.
c:
i
ntro
d
uce get
_
s
ha1_comm
i
tt
i
s
h()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
s
h
a
1_name
.
c
:
teach lookup context to get_sha1_with_
c
ontext()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sh
a
1_n
a
me
.
c
: many short names
c
a
n only be committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
sha1
_
nam
e
.
c: ge
t
_sh
a
1_1()
t
ake
s
lookup flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
H
amano
sha1_name
.
c: get_describe_name() by definitio
n
groks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Haman
o
r
e
r
e
r
e: make rr-cache fanout direct
o
ry ho
n
or umask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply: docum
e
nt
-
-3way optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
apply: allow rerere()
to work on --3way resu
l
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Hamano
apply: re
g
ister conflicted 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
man
o
ap
p
ly: --3
w
ay w
i
th add
/
add conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: move verify
_
index_match() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: plug the thre
e
-way merge logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
a
p
pl
y
:
f
a
ll
b
ack
o
n
three-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
Hamano
apply: accept -3/--3
w
a
y command line op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: move "already exist
s
" logic t
o
check_t
o
_
c
reate()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y: move check_
t
o_creat
e
_blob() c
l
os
e
r to its sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
appl
y
: further split load_preimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
ma
n
o
ap
p
ly: ref
a
ctor "previous
patch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Haman
o
apply: split load_preimage()
h
e
l
per functi
o
n out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
ap
p
ly: factor out checko
u
t_target() helper fu
n
ctio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ha
m
an
o
a
p
ply: refactor r
e
a
d_file
_
o
r_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Haman
o
a
p
p
ly: cle
a
r
_
i
m
age() clears things a bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
apply: a bit more comments on PATH_TO_BE_DELETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: fix an incomplete
comm
e
nt in check_patch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge git://gith
u
b
.
com
/
git-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Fift
h
batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Hamano
Merge branch 'cw/help-over-network'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Hamano
Mer
g
e branch 'mz/empty-rebase-test'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
M
e
rge branc
h
'pw/
g
it-
p
4-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'js/fast-export-path
s
-with-s
p
aces'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
M
erge br
a
nch
'
cw/
n
o-detaching-an-unborn
'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
Mer
g
e branch
'
v
r
/
use-our-perl-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
H
a
mano
Me
r
g
e
bran
c
h
'
mm/credential-p
l
u
m
bing'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
am
a
no
M
erge branch 'j
c
/m
a
int-blame-u
n
ique-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
Merge branch 'j
n
/perl-makemaker-leading-path
s
'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C Hamano
Mer
g
e branch 'rj/platform-pread-
m
ay-be-thread-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C H
a
mano
Merge branch 'mm/conf
i
g-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Junio
C
Hamano
Fourth
b
atch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge bra
n
ch
'nd
/
clone-sing
l
e-fix'
commit
|
commitdiff
|
tree
2012-07-05
Jun
i
o C Hama
n
o
Merge branch 'th/diff-no-index-fixe
s
'
commit
|
commitdiff
|
tree
2012-07-05
Junio C
H
amano
Merge
b
ran
c
h 'hv/remot
e
-end-hung-
u
p'
commit
|
commitdiff
|
tree
2012-07-03
J
u
nio C Hamano
sh
a
1
_name
.
c: teach get_sho
r
t_sha1() a commit-only opt
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_name
.
c: allow get_sho
r
t_s
h
a1() to ta
k
e other flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next