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 'jc/merge-blobs'
2013-01-22
Junio
C
Hamano
Merge bra
n
ch 'jc/
m
erge-blobs'
commit
|
commitdiff
|
tree
2013-01-22
Ramsa
y
J
o
ne
s
Ma
k
efil
e
: Replace merge-
f
ile
.
h
w
ith merge-blobs
.
h in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-22
Ju
n
io C Hama
n
o
Update draft
r
elease notes to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-22
Junio
C Hamano
Merge branch 'mz
/
reset-misc'
commit
|
commitdiff
|
tree
2013-01-22
Junio
C
Hamano
M
erge bran
c
h
'
n
d/fix-directory-attrs-off-b
y
-
o
ne'
commit
|
commitdiff
|
tree
2013-01-22
Junio
C
Ham
a
n
o
M
e
rge b
r
anch
'
pw/p4
-
branch-fixes'
commit
|
commitdiff
|
tree
2013-01-22
Junio
C H
a
m
ano
M
erge
b
ranch
'
mh/remote-hg
-
mode-bits-fix'
commit
|
commitdiff
|
tree
2013-01-22
Jun
i
o C Hamano
Merge branch 'fc
/
remote-hg-fixup-url'
commit
|
commitdiff
|
tree
2013-01-22
J
u
nio
C Ham
a
n
o
M
erge b
r
a
n
ch
'zk/clean
-
report-failure'
commit
|
commitdiff
|
tree
2013-01-22
Junio C Hama
n
o
Merge b
r
a
nch 'ph/rebase-preserve
-
all-merges'
commit
|
commitdiff
|
tree
2013-01-22
Junio
C
Hamano
M
e
rge branch 'nd/c
l
on
e
-no-separat
e
-git-dir-with-bare'
commit
|
commitdiff
|
tree
2013-01-22
Junio
C Ham
a
no
Merge branch
'maint'
commit
|
commitdiff
|
tree
2013-01-22
John Keepi
n
g
g
i
t-for-each-ref
.
t
x
t
: 'r
a
w' is a support
e
d date format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-21
Junio
C Haman
o
Update d
r
aft re
l
e
a
se notes
to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-21
Junio
C Hamano
Merge
branc
h
'maint
'
commit
|
commitdiff
|
tree
2013-01-21
Junio C
Haman
o
St
a
r
t
p
reparing for
1
.
8
.
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-21
Junio C Hamano
Merge branch 'nz/s
e
n
d
-email
-
headers-ar
e
-case-
i
nsens
i
t
ive
.
.
.
commit
|
commitdiff
|
tree
2013-01-21
Junio
C
Hamano
Mer
g
e branch 'r
s
/zip-with
-
unco
m
pres
s
ed
-
size
-
in-the
.
.
.
commit
|
commitdiff
|
tree
2013-01-21
Jun
i
o C Haman
o
Merge branch
'
rs/zip-tests
'
into maint
commit
|
commitdiff
|
tree
2013-01-21
Junio C
Hama
n
o
Merge g
i
t://git
.
bo
g
omips
.
org/git-
s
vn
commit
|
commitdiff
|
tree
2013-01-21
Ju
n
io C
H
amano
Merge branc
h
'rt/commit-clean
u
p-c
o
nfig'
commit
|
commitdiff
|
tree
2013-01-21
Junio C Hamano
Mer
g
e b
r
a
nch
'
ap/log-mailmap'
commit
|
commitdiff
|
tree
2013-01-18
Jun
i
o C Hamano
M
erge
g
it://bogomips
.
org
/
git-s
v
n
commit
|
commitdiff
|
tree
2013-01-18
Junio C Haman
o
U
p
d
a
te draft release notes to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-18
J
u
nio
C
Haman
o
Merge
b
ranch 'ss/help-ht
m
lpath-co
n
fig-doc'
commit
|
commitdiff
|
tree
2013-01-18
Junio C Ham
a
no
Merg
e
branch 'nd/fix-
p
erf-paramete
r
s-in-tests'
commit
|
commitdiff
|
tree
2013-01-18
Junio C Hamano
Mer
g
e b
r
anch 'n
d
/attr-deb
u
g-fix'
commit
|
commitdiff
|
tree
2013-01-18
Junio C
Hamano
Merge br
a
n
c
h
'
rs/
p
retty-use-p
r
efixcmp'
commit
|
commitdiff
|
tree
2013-01-18
Junio C Ha
m
ano
M
e
r
g
e
b
ranch
'
d
s
/
c
ompletion
-
silence-in-tre
e
-
p
ath-probe'
commit
|
commitdiff
|
tree
2013-01-18
Junio C
Hamano
Merge branch 'jn/maint-trim-vim-contrib'
commit
|
commitdiff
|
tree
2013-01-18
Ju
n
io C Ham
a
no
Mer
g
e branch 'pe/doc-
e
mail-e
n
v-is-tru
m
ped-by-config'
commit
|
commitdiff
|
tree
2013-01-18
Junio C Hamano
Merge br
a
nch 'mk/co
m
plete-tcsh'
commit
|
commitdiff
|
tree
2013-01-16
Mart
i
n von Zw
e
igbergk
reset:
up
d
ate do
c
umentation
t
o re
q
uire o
n
ly tre
e
-
i
sh
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-16
Duy Nguyen
at
t
r: avoid calling fin
d
_basename() twice
per path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Sebastian Staudt
confi
g
.
txt: Docume
n
t help
.
htmlpat
h
con
f
ig parame
t
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
N
guyễn Thái
Ngọc Du
y
test-lib
.
s
h: unfilte
r
G
I
T_PERF_*
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Nguyễ
n
Thái Ng
ọ
c Duy
attr:
make it build with DEBUG
_
ATTR again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Max Horn
remote-hg: fix handling of file perms when push
i
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Felipe Contreras
re
m
ote-hg: sto
r
e converted URL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete Wyckoff
git p4: fix submit when no master branc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete
Wyc
k
o
ff
git
p
4 test:
keep P4CLIENT changes in
s
ide subshells
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
P
ete Wyc
k
off
git p
4
: fi
x
sync --branch when no mast
e
r b
r
anch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete Wyck
o
f
f
git p4: fail gra
c
efu
l
l
y
on sy
n
c with no master branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete Wy
c
koff
git p4: rearrange self
.
initialParent use
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete Wy
c
koff
git p
4
: allo
w
short ref
names to --bran
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
P
e
te Wycko
f
f
git p4 doc: fix branch detection example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
P
e
t
e W
y
ck
o
ff
g
it
p4
:
clo
n
e -
-
b
r
anch should
che
c
kout master
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
P
ete Wyckoff
git p
4
:
verify exp
e
ct
e
d refs in cl
o
ne
--bare test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
P
e
te Wyckoff
git p4: creat
e
p4/HEAD on initial clone
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete W
y
c
koff
g
it p4: inline
lis
t
Existi
n
gP4GitBranches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete Wyckof
f
g
it p
4
: add comments to p4BranchesInGit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
P
e
te Wyckoff
g
i
t p4: rearrang
e
an
d
simplify ha
s
Origin h
a
ndling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Pet
e
Wy
c
k
of
f
g
i
t
p4: test sync/clone --b
r
anch behavior
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Mart
i
n
von Zwe
i
gbergk
reset
[
-
-mixed]: use
diff-bas
e
d re
s
et wh
e
the
r
or not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin vo
n
Z
we
i
gbe
r
g
k
r
eset: allo
w
re
s
e
t
o
n
unborn branc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweig
b
ergk
reset $sha1
$paths
p
ec:
require $
s
ha1 only to
b
e t
r
eeish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweigberg
k
res
e
t
.
c: inline update_inde
x
_re
f
r
e
sh()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Mart
i
n von
Z
weigber
g
k
re
s
et
.
c: finish
entire cmd_reset() whether or not
pathspe
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin v
o
n Zw
e
igbergk
r
eset [--mixed]: only write index file once
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin v
o
n Zweigbergk
reset
.
c: move
lo
c
k, wri
t
e and commit
o
u
t of update_
i
n
de
x
_ref
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Mart
i
n
von
Zw
e
i
g
bergk
reset
.
c: move update_index_refres
h
()
call out of read_from_t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Mart
i
n von Zw
e
i
g
b
e
rgk
rese
t
.
c
: replace
swit
c
h by if-else
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
M
a
rtin von
Z
weigbergk
r
eset: avoid redundant erro
r
message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Ma
r
t
in
v
on Zweigbergk
r
e
set
-
-
k
eep: only write index
file o
n
ce
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
M
a
rtin von Zweigbergk
reset
.
c: share call to die_if_
u
nmer
g
ed_ca
c
he()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin
von Zw
e
ig
b
ergk
res
e
t
.
c:
extract function
for upda
t
ing
{
ORIG_,
}
H
E
A
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Marti
n
von Zweigbergk
reset
.
c: remo
v
e unnec
e
ssar
y
variable 'i'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
M
a
rtin von
Zweigbergk
r
e
s
et
.
c: extract function for parsi
n
g arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweigber
g
k
reset: don't
allow "git reset -- $pathspec" i
n
b
are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
M
a
rtin von Zweigberg
k
reset
.
c:
pass
p
athspec ar
o
und
i
nstead of
(
pr
e
fix, argv
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Mar
t
in
v
on Zweigbergk
reset
$pathspec: exit wi
t
h
code 0 if su
c
c
essful
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
M
a
rtin von Z
w
e
i
gb
e
rgk
reset $pathsp
e
c: no
need to discard index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Nguyễn Th
á
i
Ng
ọ
c Duy
attr: f
i
x
off-by-one directory component length ca
l
culation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-14
R
e
n
é Scha
r
fe
pretty: use prefix
c
m
p
instead o
f
m
emcmp on
NUL-
t
erminate
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-14
Phil H
o
r
d
rebase --pres
e
r
ve-merges: keep all merge c
o
mmits including
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-14
Zoltan Klin
g
er
git-clean: Display
m
ore accurate
d
elete messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-14
J
u
nio C Ha
m
ano
Sync with 1
.
8
.
1
.
1
commit
|
commitdiff
|
tree
2013-01-14
J
unio C Ham
a
no
U
pdate dra
f
t rele
a
se
n
otes t
o
1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-14
Juni
o
C Hamano
Merge branch 'jc/blame-no-fo
l
low'
commit
|
commitdiff
|
tree
2013-01-14
Junio C Haman
o
Merge
b
ranch 'f
c
/remote-testg
i
t-featur
e
-done'
commit
|
commitdiff
|
tree
2013-01-14
Junio C H
a
mano
Merge br
a
nch
'nd/upload
-
pack-shallow-must-be-commit'
commit
|
commitdiff
|
tree
2013-01-14
Ju
n
io C Hamano
Merg
e
branch 'ap/status-
i
gnored-in
-
ignored-directory
'
commit
|
commitdiff
|
tree
2013-01-14
J
u
nio C Ha
m
ano
Merge
branch 'nz/send-
e
mail-headers-
a
re-case-i
n
sensitive'
commit
|
commitdiff
|
tree
2013-01-14
J
unio C
Hamano
Git 1
.
8
.
1
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-14
Junio
C Hamano
Merge branch 'jk/complete-commit-
c
' into maint
commit
|
commitdiff
|
tree
2013-01-14
J
u
nio C Ha
m
ano
M
erge branch '
j
k/unify-exit-code
-
by-re
c
eiving-signal
.
.
.
commit
|
commitdiff
|
tree
2013-01-14
J
u
nio C Hamano
Merge branch 'jn/xml-depends-o
n
-
a
sciidoc-
c
onf' into
.
.
.
commit
|
commitdiff
|
tree
2013-01-14
Junio C Hamano
Merge branch 'jk/maint-fast-impor
t
-doc-reorder' into
.
.
.
commit
|
commitdiff
|
tree
2013-01-14
J
uni
o
C Ha
m
ano
M
e
rge branch 'jk/shortlog-no-wr
a
p-doc' into
main
t
commit
|
commitdiff
|
tree
2013-01-14
J
u
n
i
o C Hamano
Me
r
ge
b
ranch 'jk/
m
a
i
nt-fast
-
i
m
port-doc-dedup
-
done'
.
.
.
commit
|
commitdiff
|
tree
2013-01-14
Juni
o
C Hamano
M
erge branc
h
'jc/comment-cygwin
-
wi
n
32api-in-makefi
l
e
.
.
.
commit
|
commitdiff
|
tree
2013-01-14
Junio C Hamano
Merge branch 'rs/leave-ba
s
e
-
name-in-name-field-o
f
-tar
.
.
.
commit
|
commitdiff
|
tree
2013-01-14
J
u
nio C Hamano
Merge branch 'jl/interrupt-c
l
one-remove
-
separate-git
.
.
.
commit
|
commitdiff
|
tree
2013-01-14
Junio
C
Hamano
Merge branch 'jc/maint-fmt-merge-ms
g
-no-
e
d
it-lose-credit
.
.
.
commit
|
commitdiff
|
tree
2013-01-14
Ju
n
io
C Hamano
Merge br
a
nch 'jc
/
apply-t
r
aili
n
g-blank-rem
o
val'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2013-01-14
Jun
i
o C Hamano
Merge bran
c
h 'pf/editor-ignore-s
i
g
i
n
t' in
t
o
m
aint
commit
|
commitdiff
|
tree
2013-01-14
Junio C H
a
m
ano
M
e
r
ge branch 'm
k
/maint-graph-infin
i
ty-
l
o
o
p' into maint
commit
|
commitdiff
|
tree
2013-01-12
Ju
n
io C Hamano
U
p
date d
r
a
ft re
l
ea
s
e no
t
es to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-12
Junio C H
a
m
ano
M
e
rge bran
c
h 'jk/m
a
int
-
fast-import-do
c
-reorder'
commit
|
commitdiff
|
tree
2013-01-12
Ju
n
i
o C Hamano
Mer
g
e
b
ran
c
h '
j
k/shortlo
g
-no-wrap-doc'
commit
|
commitdiff
|
tree
next