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
Show error for 'git merge' with unset merge.defaultToUpstream
2011-11-21
Vincent van R
a
v
e
steijn
Sho
w
error for
'
git mer
g
e' with un
s
et merge
.
d
e
faultToUpstream
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-18
Jun
i
o
C Hamano
Git 1
.
7
.
7
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-18
Junio C Hamano
Merge
branch 'jc
/
maint-name-re
v
-all' into maint
commit
|
commitdiff
|
tree
2011-11-18
Junio C Hamano
Merge branch
'
ml/mai
l
map'
in
t
o
m
aint
commit
|
commitdiff
|
tree
2011-11-18
J
uni
o
C Ha
m
ano
M
e
rge
bran
c
h
'jn/maint-n
o
te
s
-a
v
oi
d
-va-ar
g
s
'
i
nto maint
commit
|
commitdiff
|
tree
2011-11-18
Jona
t
ha
n
Nie
d
er
Makefile: add missing header file dep
e
ndencie
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-18
Jonathan
Nied
e
r
notes merg
e
: el
i
m
inate OUTPU
T
m
acro
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-17
Marc-A
n
dré Lureau
mailma
p
:
x
calloc m
a
ilmap_info
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-15
J
u
nio C Hamano
name-rev --all: do not ev
e
n att
e
mp
t
t
o
de
s
c
r
ibe
non
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-09
Junio C Haman
o
Git 1
.
7
.
7
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-09
Junio C
Hamano
Merge branch 'jc/maint-remove-renamed-ref'
int
o
maint
commit
|
commitdiff
|
tree
2011-11-09
Junio C Hamano
Me
r
ge bran
c
h 'j
m
/maint-gitweb-filte
r
-
f
o
rk
s
-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-11-09
Junio
C
Hama
n
o
Merge b
r
anch 'dm/pack-objects-update
'
into maint
commit
|
commitdiff
|
tree
2011-11-08
Junio C Ham
a
no
doc
s
: Update
inst
a
ll
-
doc-quick
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-08
Jeff King
docs: d
o
n't mention
-
-quiet
o
r --
e
xit-code
in git-log(1)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-01
Junio C Ha
m
an
o
Git 1
.
7
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-01
Ju
n
io C
H
amano
Me
r
ge br
a
nch 'rs/ma
i
nt-estim
a
te-cache-size' into
maint
commit
|
commitdiff
|
tree
2011-11-01
J
u
nio C Hamano
Merg
e
branch 'md/smtp-t
l
s-hello-again'
into maint
commit
|
commitdiff
|
tree
2011-11-01
J
unio C Hamano
Mer
g
e branch 'jk/pull-r
e
b
a
s
e-with-w
o
rk-tree' int
o
maint
commit
|
commitdiff
|
tree
2011-11-01
Junio C H
a
mano
Merge branch 'jc/maint-di
f
fstat-numstat-
c
on
t
ext' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-11-01
Junio C Hamano
Mer
g
e branch 'js/b
i
se
c
t-n
o
-chec
k
o
u
t
' into main
t
commit
|
commitdiff
|
tree
2011-11-01
Junio C Hamano
Mer
g
e
bran
c
h 'bc/a
t
tr-i
g
n
or
e
-case
'
int
o
ma
i
n
t
commit
|
commitdiff
|
tree
2011-11-01
Junio C Hamano
Merge branc
h
'c
n
/fetch-prune' into
maint
commit
|
commitdiff
|
tree
2011-11-01
Ju
n
i
o
C Hamano
Merg
e
b
ranch 'sp/smar
t
-http-
f
ailure' into main
t
commit
|
commitdiff
|
tree
2011-11-01
Junio C Ham
a
n
o
Merge
j
n/maint-http
-
error-mess
a
ge
commit
|
commitdiff
|
tree
2011-10-31
Pat T
h
oyts
t
7511: avoid use of
r
eser
v
ed fil
e
name on Wi
n
dows
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-27
Junio C Hamano
Merge
b
ranch 'rs/
m
aint-estimate-c
a
che-size
'
i
nto maint
commit
|
commitdiff
|
tree
2011-10-27
Richar
d
Har
t
mann
clone:
Q
uote us
e
r
suppli
e
d
path in a s
i
ngle quote pair
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-26
Junio C Haman
o
Merge br
a
nch 'jn/gitweb-highlite-sa
n
i
t
is
e
' into ma
i
nt
commit
|
commitdiff
|
tree
2011-10-26
Junio C Hamano
Merg
e
branch 'jk/argv-array'
into mai
n
t
commit
|
commitdiff
|
tree
2011-10-26
Ju
n
io C
H
amano
Me
r
ge
b
ranch
'jc/
r
u
n
-rece
i
ve-hook-cleanup' int
o
m
a
int
commit
|
commitdiff
|
tree
2011-10-26
J
unio
C Hamano
Merge b
r
a
n
ch 'cn/eradicate-worki
n
g-copy' into
m
aint
commit
|
commitdiff
|
tree
2011-10-26
Junio C Hamano
Merge branc
h
'maint-1
.
7
.
6'
into mai
n
t
commit
|
commitdiff
|
tree
2011-10-26
Junio C Hamano
Merge
bra
n
ch 'mh/maint-n
o
tes-m
e
r
g
e-pathbuf-fix'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-10-26
Junio
C
Haman
o
Merge branch
'
p
s
/gitweb-js-wit
h
-lineno' into main
t
.
.
.
commit
|
commitdiff
|
tree
2011-10-26
Ju
n
io
C
Haman
o
Merge bran
c
h 'jm/mergetool-p
a
thspec' into maint-1
.
7
.
6
commit
|
commitdiff
|
tree
2011-10-26
J
u
nio C Hamano
Merge
b
ranch
'mz/
r
emote-rename' int
o
maint-1
.
7
.
6
commit
|
commitdiff
|
tree
2011-10-26
Junio C
H
amano
Mer
g
e branch
'rj/maint-t915
9
-
s
v
n
-
re
v
-notat
i
on' into
.
.
.
commit
|
commitdiff
|
tree
2011-10-26
J
u
nio C Ham
a
no
M
e
rge branc
h
'
h
l/iso8601-more-zo
n
e-formats'
i
nto mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2011-10-26
Ju
n
io C
Hama
n
o
Merge branch 'ma
i
nt-1
.
7
.
6'
i
nto maint
commit
|
commitdiff
|
tree
2011-10-26
Jun
i
o C Hamano
Merge br
a
nch '
t
r/doc-note-rewrite' int
o
m
aint-1
.
7
.
6
commit
|
commitdiff
|
tree
2011-10-26
Ju
n
io C Hamano
M
e
rg
e
bra
n
c
h
'nd/s
p
arse
-
doc' into
m
ai
n
t-1
.
7
.
6
commit
|
commitdiff
|
tree
2011-10-26
J
uni
o
C
H
amano
Merge branch 'mg
/
main
t
-doc-sparse-checkou
t
' in
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2011-10-26
Junio
C
Ha
m
ano
M
erge branch 'main
t
-1
.
7
.
5
' into
m
a
i
nt-1
.
7
.
6
commit
|
commitdiff
|
tree
2011-10-26
Ju
n
i
o
C Hamano
Merge
b
ranch 'maint-
1
.
7
.
4'
into maint-1
.
7
.
5
commit
|
commitdiff
|
tree
2011-10-26
Juni
o
C
Ha
m
ano
Me
r
g
e branch 'maint-1
.
7
.
3' into
m
aint-1
.
7
.
4
commit
|
commitdiff
|
tree
2011-10-26
Juni
o
C Hamano
Merge branch 'sn/doc-up
d
a
t
e-index-assume-uncha
n
ged
.
.
.
commit
|
commitdiff
|
tree
2011-10-26
René Scharfe
read-cache
.
c: fix index memory a
l
location
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-26
Jim Meyer
i
ng
make the s
a
mple
pre-commit hook script r
e
ject nam
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-24
J
u
nio C Hamano
Merge
b
ranch
'
maint-1
.
7
.
3' i
n
to
ma
i
nt
commit
|
commitdiff
|
tree
2011-10-24
N
guyễn
Thái Ngọc Duy
R
eindent
clo
s
ing bracket using ta
b
ins
t
ead of s
p
a
c
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-24
Junio C Hama
n
o
Git 1
.
7
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-24
J
onath
a
n Nie
d
e
r
RelNo
t
es
/
1
.
7
.
7
.
1: setgid bit patch is ab
o
ut fixi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-21
J
ulien Muchembl
e
d
gitweb: fix regr
e
ssi
o
n
w
hen filtering out
forks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-21
Junio C Hamano
A
l
most read
y
for 1
.
7
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-21
Junio C Hamano
Merge branch 'nd/maint-autofi
x
-tag-in-h
e
a
d
'
into maint
commit
|
commitdiff
|
tree
2011-10-21
Junio C Hamano
Merge
branch 'j
c
/
apply-blank-at-eof-fix'
into maint
commit
|
commitdiff
|
tree
2011-10-21
Junio C Hamano
Merg
e
b
ra
n
ch
'jn/no-g-plu
s
-s-on-bsd' int
o
maint
commit
|
commitdiff
|
tree
2011-10-21
Jun
i
o C Hamano
Merge branch 'rs/diff-
c
leanup-reco
r
d
s-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2011-10-21
Junio C Hamano
Merge
b
ranch 'il/arc
h
ive-e
r
r-signal' into maint
commit
|
commitdiff
|
tree
2011-10-21
Junio C H
a
mano
Merge b
r
anch 'js/m
a
int-merge-one-file-
o
sx-ex
p
r' into
.
.
.
commit
|
commitdiff
|
tree
2011-10-21
Junio C Hamano
M
e
r
g
e
bra
n
ch '
j
m/ma
i
nt-ap
p
ly-detec
t
s
-
corrupt-pat
c
h
.
.
.
commit
|
commitdiff
|
tree
2011-10-21
J
u
nio C Hamano
Merge branch
'
jc
/
checkout-from-tre
e
-keep-local-ch
a
nges
.
.
.
commit
|
commitdiff
|
tree
2011-10-21
Junio C Ha
m
a
n
o
Merge branch '
m
m/m
a
int-confi
g
-explicit-bool-
d
ispla
y
.
.
.
commit
|
commitdiff
|
tree
2011-10-21
Dan McG
e
e
pack-
o
bjects: don't trave
r
se object
s
unnecessarily
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-18
Brandon
Casey
strbuf
.
c: remove un
n
ecessary st
r
buf
_
gro
w
(
) from
s
trbuf_
g
e
t
wh
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-18
Dan McGe
e
pack
-
o
bject
s
: rew
r
ite add_descendants_to_w
r
i
te
_
or
d
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-18
Dan McG
e
e
pack-object
s
: use unsig
n
ed int for count
e
r
and offset
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-18
Dan M
c
Gee
p
ack-objec
t
s: m
a
rk add
_
t
o
_w
r
ite_o
r
der() as inline
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-16
Carlos
Martín Nie
t
o
fetch:
treat --
t
ags like re
f
s/tags/*
:
refs/tags/*
wh
e
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-16
Carlo
s
Martín Nieto
fetch: h
o
nor t
h
e user-p
r
ov
i
d
e
d
r
efspecs when
pruning
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-16
C
arlos Martín Ni
e
to
r
emote: separate out the
r
emote_
f
ind_trackin
g
logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hamano
P
r
epare for 1
.
7
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-16
Juni
o
C
Hamano
Merge branch 'ms
/
p
a
tch-i
d
-with-overlong-line' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
Junio C H
a
mano
Merg
e
branch 'jc/mai
n
t-bu
n
dle-too-quiet' into maint
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hamano
Mer
g
e b
r
anch 'jk
/
filter-br
a
nch-require-clea
n
-w
o
r
k
-
tr
e
e
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hamano
M
e
rge
b
ranch 'j
c
/maint
-
fsck-f
w
rite-s
i
ze-check' into
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
Ju
n
io
C
Haman
o
Merge branch
'bk/
a
nce
s
try-
p
ath' into
m
aint
commit
|
commitdiff
|
tree
2011-10-16
J
u
n
io C
Hama
n
o
Mer
g
e branch 'jk/
m
aint-fetch-submodule-check
-
fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
Junio C Haman
o
Merge branch 'tr/merge
t
ool-valgri
n
d' i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-10-16
J
unio C Hamano
Merg
e
b
ranch 'nm/grep-object-
s
h
a
1
-lock' into maint
commit
|
commitdiff
|
tree
2011-10-16
J
u
nio C Hamano
M
erge br
a
nch 'jc/diff-index
-
unpack' into
main
t
commit
|
commitdiff
|
tree
2011-10-16
J
u
n
io C Hamano
M
e
r
ge b
r
anc
h
'
m
m/re
b
ase-
i
-exec-edit'
i
n
t
o maint
commit
|
commitdiff
|
tree
2011-10-16
Matthew Daley
s
e
nd-e
m
ail: Hon
o
ur SMTP domain when usi
n
g TLS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-14
Re
n
é
Scharfe
t1304: fall back t
o
$USER if $LO
G
NAME i
s
not def
i
n
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-13
Je
f
f
King
pull,
r
ebase: handle GIT_WORK_TR
E
E
better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-12
Jim Meyeri
n
g
fix
"git apply -
-
i
n
dex
.
.
.
" no
t
to
d
e
r
ef NULL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-12
Junio
C
Hamano
branch
-
m/-M: remove undoc
u
mented RE
N
AMED-REF
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-11
B
randon
Casey
attr
.
c: respect core
.
i
g
norecase when mat
c
hing
a
ttribute
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-10
Matthieu Moy
c
onfig: di
s
p
la
y
key
_
d
elim fo
r
config --bool --get-regex
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-07
Carlos Martín Nieto
t
5
510
:
a
d
d tests for fe
t
ch --pr
u
ne
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-07
Carlos Mart
í
n Nieto
fetch
:
fr
e
e all the addi
t
i
o
nal refspe
c
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-06
Junio C
Ham
a
no
attr
:
read
core
.
a
t
tributes
f
ile from
g
i
t
_default_
c
o
r
e_config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-06
Brandon Ca
s
ey
b
uiltin/mv
.
c
:
p
lug miniscule m
e
mory le
a
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-06
B
randon
Ca
s
ey
cl
e
an
u
p: use inter
n
al m
e
m
ory allocation wrapper func
t
io
n
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-06
Brandon Ca
s
ey
attr
.
c:
a
v
oid
i
napp
r
opria
t
e access to strbuf "bu
f
"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-06
Jay Soffian
merge-
o
ne-file:
f
i
x "ex
p
r:
n
on
-
n
umeric a
r
gument"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-05
Ilari
Liusvaara
Support ERR in rem
o
te archive lik
e
in fetch/push
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-05
Shawn O
.
Pe
a
rce
remo
t
e-curl: Fix warning afte
r
H
TTP failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-03
Jonathan Nieder
Makefile
:
do not set setgid bit on di
r
ectories o
n
GNU
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next