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: make branch.<name>.mergeoptions correctly override merge.<option>
2011-05-06
Ju
n
io C Hamano
merge: make
b
ra
n
c
h
.
<na
m
e>
.
merge
o
pti
o
ns co
r
r
ectly
override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Jun
i
o C Hamano
Git 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Ju
n
io C Hamano
Merge bra
n
ch
'
maint
'
commit
|
commitdiff
|
tree
2010-02-12
Junio C Ha
m
a
no
Fix typo
in 1
.
6
.
6
.
2 release notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Junio
C Hamano
Re
-
fix chec
k
-ref-forma
t
documen
t
a
tion mark-up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Juni
o
C Hamano
archive documentation: attribu
t
es ar
e
taken
f
rom the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Junio
C
Hamano
M
erg
e
branch 'maint
'
commit
|
commitdiff
|
tree
2010-02-10
J
uni
o
C H
a
mano
Updat
e
d
r
aft r
e
lease notes to
1
.
7
.
0 o
n
e
m
ore time
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Junio
C
Hamano
Syn
c
with 1
.
6
.
6
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Git
1
.
6
.
6
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
J
u
n
io C Hamano
Merge branch 'maint-1
.
6
.
5'
int
o
m
a
i
nt
commit
|
commitdiff
|
tree
2010-02-10
Ju
n
io C Hamano
t8
0
0
3:
c
heck
e
xit code of c
o
mmand and error
m
e
ss
a
ge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Junio
C
H
a
m
ano
Merge branch '
s
p/maint-
f
ast-imp
o
rt-
l
a
rge-blob' into
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Mer
g
e branch 'gp/maint
-
cvs
s
e
rver' into maint
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Merge b
r
a
nch '
j
c/
m
a
i
nt-
r
e
f
l
og-ba
d
-
t
imestamp' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2010-02-10
Junio
C Haman
o
Merge branch 'il
/
maint-xmallocz' into maint
commit
|
commitdiff
|
tree
2010-02-10
Jun
i
o
C
Ham
a
no
Merge branch 'j
h
/
m
ain
t
-conf
i
g-file-prefix'
i
nto maint
commit
|
commitdiff
|
tree
2010-02-10
J
unio
C
H
ama
n
o
M
erge branch 'nd/include-termios-for-osol' in
t
o maint
commit
|
commitdiff
|
tree
2010-02-10
Jun
i
o C Hamano
Merge branch 'jc/maint-1
.
6
.
1-check
o
u
t
-m
-
cus
t
o
m-merge
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
M
e
rge bran
c
h 'rs/main
t
-ar
c
hive-match-paths
p
ec' into
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Jun
i
o C Haman
o
c
h
eck-
r
ef-format d
o
c
u
mentation
:
f
ix enum
e
ra
t
ion mark-up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-09
Junio C Hama
n
o
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-02-09
Junio
C
Ha
m
an
o
M
e
rge branch 'maint-
1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-02-09
Juni
o
C Hamano
Merge branch 'jc/maint
-
push-doc-status' int
o
main
t
commit
|
commitdiff
|
tree
2010-02-09
Jun
i
o C Ham
a
no
g
i
t-pu
s
h: document all t
h
e status flags
used in the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-08
Junio
C
Hama
n
o
Merg
e
b
r
an
c
h
'jc/maint-
i
ma
p
-config-parse' into maint
commit
|
commitdiff
|
tree
2010-02-08
Junio C H
a
mano
Fix pars
i
ng of i
m
ap
.
p
reforma
t
tedHTML
and imap
.
s
s
lve
r
ify
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-08
Junio C Hamano
Merge branch 'jc/main
t
-doc-git-add-example' into maint
commit
|
commitdiff
|
tree
2010-02-08
Juni
o
C Hamano
g
i
t-add doc
u
mentation: Fi
x
s
h
ell q
u
otin
g
example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-07
Junio C H
a
m
a
no
Merge
git:
/
/repo
.
or
.
cz/git
-
gui
commit
|
commitdiff
|
tree
2010-02-07
J
u
ni
o
C Hamano
Mer
g
e branch
'
maint'
commit
|
commitdiff
|
tree
2010-02-06
Junio C Haman
o
Merge git://gi
t
.
k
erne
l
.
o
rg
/
p
ub/scm
/
g
i
tk/gitk
commit
|
commitdiff
|
tree
2010-02-06
Junio C Hama
n
o
Update draft re
l
ease
notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Jun
i
o C
Hama
n
o
Mer
g
e
branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2010-02-05
Ju
n
io C Hama
n
o
Merge branch 'jc/maint-limit-
n
o
t
e
-output' into maint
commit
|
commitdiff
|
tree
2010-02-05
Junio C Ham
a
no
Re
v
ert 30816237 and 7e62265
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Juni
o
C Hamano
fast-import: co
u
nt
--max-pack-
s
iz
e
in
b
yt
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Junio C
Ha
m
ano
fa
s
t-imp
o
rt
.
c: Fix
big-file-threshold pars
i
ng
b
u
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-03
J
uni
o
C H
a
mano
Merge b
r
anch
'ms/
f
i
lt
e
r-branch-submo
d
ule'
commit
|
commitdiff
|
tree
2010-02-03
Jun
i
o C Hamano
M
erge br
a
nch 'jh/gitweb
-
caching'
(
early part)
commit
|
commitdiff
|
tree
2010-02-03
J
u
nio C Hamano
Merge bra
n
ch
'bw/no-python-autoconf'
commit
|
commitdiff
|
tree
2010-02-03
Junio C Hamano
M
erge
branch 's
p
/fast-
i
mpor
t
-large-b
l
ob'
commit
|
commitdiff
|
tree
2010-02-02
Jun
i
o C Ha
m
ano
b
ui
l
d: make
cod
e
"-
W
p
o
int
e
r
-
arith" c
l
ean
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Junio C Hamano
Merge branch 'sp/
m
a
i
n
t-fast-import-l
a
rg
e
-
bl
o
b' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-02-01
J
u
nio C Ha
m
a
n
o
M
e
rge
b
ra
n
ch
'
sb
/
m
a
int-octopus' into m
a
int-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-02-01
Junio C
H
a
m
an
o
Merge branch
'bg/maint-ad
d
-
a
l
l
-doc'
into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-31
Jun
i
o C Hamano
Update
d
ra
f
t relea
s
e notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
Juni
o
C
H
am
a
no
M
e
rge branch
'
dm/make-
t
hread
e
d-
s
implify'
commit
|
commitdiff
|
tree
2010-01-31
Junio C Ha
m
an
o
R
PM packag
i
n
g
: u
s
e %global inside %{!?
.
.
.
}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Junio C
H
amano
is_
s
ubmodule_modi
f
ied(): fix breakage with
external
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Junio C Hamano
RPM packaging: don't inclu
d
e fore
i
gn-scm-helper
b
i
ts ye
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Junio
C
Hama
n
o
Update dr
a
ft rel
e
ase notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-01-30
J
uni
o
C
H
a
ma
n
o
M
erge branc
h
'ma
i
nt-1
.
6
.
5' into ma
i
nt
commit
|
commitdiff
|
tree
2010-01-29
Junio C Ham
a
no
Merge git://
g
it
.
kern
e
l
.
or
g
/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2010-01-28
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-28
J
unio C
Hamano
grep
--quiet:
finishi
n
g
touches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-28
J
u
nio C Hamano
Merge branch 'fk/thr
e
aded-grep'
commit
|
commitdiff
|
tree
2010-01-28
Ju
n
io C Haman
o
Merge branch 'g
p
/m
a
int-cvsserver'
commit
|
commitdiff
|
tree
2010-01-28
J
u
nio C Ham
a
no
tests: u
p
date tests
that
used to fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-27
J
un
i
o C
Ha
m
ano
Mer
g
e branch 'j
c
/upstream-
r
eflog
'
commit
|
commitdiff
|
tree
2010-01-27
J
unio C Ha
m
a
n
o
M
e
rg
e
b
r
anch 'jc/maint-reflog-bad-timestamp'
commit
|
commitdiff
|
tree
2010-01-27
J
unio C H
a
man
o
M
erge branch '
i
l/maint-colon-address'
commit
|
commitdiff
|
tree
2010-01-27
Junio C Hama
n
o
Merg
e
branch 'il/maint-xmallo
c
z'
commit
|
commitdiff
|
tree
2010-01-27
Junio
C
H
am
a
no
Merge
b
ranch
'
jh/maint-config-file-pre
f
ix
'
commit
|
commitdiff
|
tree
2010-01-27
J
uni
o
C Haman
o
transport_get(): drop unnecessary check for !remote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-27
Ju
n
io
C Hamano
t0101: use a fixed time
s
tamp when s
e
ar
c
hing in t
h
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-27
Junio C Ham
a
no
Upd
a
te
@{bog
u
s
.
timestamp} fix not
t
o die()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-27
Junio
C
H
amano
Merge branc
h
'j
l
/diff
-
s
ubmodule-ignore'
commit
|
commitdiff
|
tree
2010-01-27
J
u
nio C Hamano
work around an obnoxious
b
ash "safety fea
t
ure" on Ope
n
BSD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-26
Junio C Hamano
approxidate_care
f
ul() rep
o
rts
e
rrorn
e
ous date strin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-26
Junio
C Hamano
F
ix
l
og -g this@
{
upstre
a
m}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-25
Junio C Hamano
grep: expose "st
a
tu
s
-onl
y
" feature via -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-25
Juni
o
C Ham
a
no
Merge branc
h
'jc/fix-tree-wal
k
'
commit
|
commitdiff
|
tree
2010-01-24
Junio
C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-24
Junio C Hamano
M
e
rge b
r
anch 'm
a
int' o
f
g
it://gi
t
.
spearce
.
org/gi
t
-
g
ui
.
.
.
commit
|
commitdiff
|
tree
2010-01-24
Junio C Hamano
Mer
g
e branch 'doc-s
t
y
l
e/for-next' of g
i
t://repo
.
o
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-24
Junio C Hama
n
o
pull: re-fix command
l
i
ne ge
n
eration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-24
Junio C Hamano
Mak
e
c
e
_uptodate() tr
u
stwo
r
thy again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-24
Ju
n
io
C Haman
o
re
b
ase -i: Export GIT_
A
UTHOR
_
* variables
e
x
plicit
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-23
Junio
C
Hamano
Mer
g
e
git:/
/
git
.
bogo
m
ips
.
org
/
g
i
t-svn
commit
|
commitdiff
|
tree
2010-01-23
Ju
n
io C
Hamano
U
p
d
a
te draft re
l
ease notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hama
n
o
Merge branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2010-01-23
J
u
nio C Haman
o
Merge branch 'jc/branch-d
'
commit
|
commitdiff
|
tree
2010-01-23
Junio C
Ha
m
a
n
o
M
e
rge bra
n
ch 'il/rev-glob'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Ham
a
no
Merge branch 'js/refer-upstream
'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hamano
Merge bra
n
ch 'jl/submodule-
d
i
ff
'
commit
|
commitdiff
|
tree
2010-01-23
Jun
i
o
C
Hamano
Merge
b
ranch 'il/
r
emote-updates'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hamano
Merg
e
branch
'
il/br
a
nch-
s
et-upst
r
eam'
commit
|
commitdiff
|
tree
2010-01-23
Juni
o
C Hamano
Merge branch 'jc/maint-limit
-
note-output'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hamano
Mer
g
e branch 'nd/ls-files-spa
r
se-fix'
commit
|
commitdiff
|
tree
2010-01-22
Junio C
Hamano
ignore duplicated slashes in make_relative_path()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
git-mv: fi
x
movin
g
more th
a
n
one source t
o
a
single
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Junio C
Ha
m
ano
Merge
b
ranch
'
maint'
commit
|
commitdiff
|
tree
2010-01-22
Junio
C Hama
n
o
mer
g
e-recursive: do not return NUL
L
only
t
o
c
ause segfault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
Fix "
l
og --oneline
"
not to show notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
conflict-marker-size:
a
dd te
s
t and docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C H
a
man
o
Update draft re
l
ease notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
a
mano
M
e
rge
branch 'bw/
c
vsimport'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hama
n
o
Merge bra
n
ch
'
jc
/
che
c
kou
t
-mer
g
e-base'
commit
|
commitdiff
|
tree
next