repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint' to sync with 1.6.5.7
2009-12-16
Junio C Hamano
Merge branch 'mai
n
t' to s
y
nc with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Git 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hama
n
o
w
orktree: don't segfault with an ab
s
olute p
a
thspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Jeff King
ignore unk
n
o
w
n color config
u
ration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Jo
h
annes Sixt
help
.
autocorrect: do not
r
un a
command
i
f the comma
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-15
Nanako Shiraish
i
Illustra
t
e "fi
l
ter" attribute
w
ith an example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Björ
n
Gust
a
vsson
b
a
sh:
Suppor
t
new 'git fetch
'
options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Ha
m
ano
Upd
a
t
e
Release N
o
tes for 1
.
6
.
6 t
o
rem
o
ve old bugfixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Jun
i
o C Hamano
S
y
nc
w
ith 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Git
1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C
Hamano
F
i
x arc
h
ive format
wi
t
h --
o
n
the
c
ommand line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Juni
o
C
H
a
m
ano
R
e
m
ove post-u
p
l
o
ad-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Juni
o
C Hamano
G
i
t 1
.
6
.
6-
r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git:/
/
r
e
p
o
.
o
r
.
c
z
/g
i
t-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Hama
n
o
Merge git://
g
it
.
kernel
.
o
r
g/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ham
a
n
o
Update draft release notes t
o
1
.
6
.
6
be
f
ore -rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Ham
a
no
M
er
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
amano
Merge branch 'mm/maint-merge-ff-er
r
or-me
s
sage-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C Hamano
Merge branch 'jn/maint-pull-rebase-error-
m
essage' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C Ha
m
ano
Merge branch 'jk/
m
ain
t
-add-
p
-d
e
l
e
te-fix' in
t
o
m
a
i
nt
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git://git
.
bogomi
p
s
.
org/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio
C Hamano
Revert recent
"
gi
t
me
r
ge <ms
g
> HEAD <commit>
.
.
.
" deprecation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-08
Jeff
King
add-intera
c
t
i
ve: fix
dele
t
i
on of non-empty files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-06
SZEDER Gábor
bash: update
'
g
it com
m
it' comp
l
et
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Sync with 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio
C
Haman
o
Git
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Linus Torva
l
ds
Fix diff -B/--dirstat miscounting of newly adde
d
conte
n
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
r
e
se
t
: impr
o
ve worktree safety valves
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Todd
Zullinger
Doc
u
mentation: Avoid use of
x
mlto --st
r
ing
p
aram
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
René Scharfe
arc
h
ive: clarify
description of path p
a
rameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
rere
r
e: don't segfault
on failure to open
r
r-cach
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
branc
h
'main
t
'
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Haman
o
Prepare
f
or 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
uni
o
C
Hama
n
o
Me
r
ge br
a
nch 'uk/maint
-
sh
o
rtlog-encoding' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hama
n
o
Merge branc
h
'
fc/maint-f
o
rmat-patch-path
s
pec-das
h
es
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
a
m
ano
Me
r
g
e
branch 'ap/maint-m
e
rge-strategy-list-f
i
x' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
M
erge branch
'jc
/
maint-am-keep
'
in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C
Ha
m
an
o
Merge branch
'
r
s/work-ar
o
un
d
-
g
rep-opt-insanity'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge
b
ranch
'
rj/maint-c
y
g
win-count-objects' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hama
n
o
M
e
rge
b
r
anch 'mm/ma
i
nt
-
hint
-
f
ai
l
ed
-
merge' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
M
erge
b
ranch 'th/maint-remot
e
-up
d
at
e
-hel
p
-s
t
ring'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge
b
r
anc
h
'rj/maint-t9700' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C Hamano
M
erge
b
ranc
h
'
l
s
/
m
a
int-mailinfo-no-inbody' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ham
a
no
Merge branch
'
mo/maint-crlf-
d
oc' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Me
r
ge branch 'th/remot
e
-usage'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
branch 'pb/maint-use-c
u
stom-per
l
' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hama
n
o
Merge branch
'
mm/con
f
ig-path
n
ame
-
tilde-expand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
M
e
r
ge br
a
n
ch
'bc/
g
r
e
p
-i-F' into
mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge branch 'jk/maint-break-renam
e
-reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bra
n
ch 'rj/mai
n
t
-
s
implify-cygwin-makefi
l
e
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge branch 'rg/doc-wor
k
flo
w
' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge branch 'np
/
ma
i
nt-sideband-favor-status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jakub Narebsk
i
gitweb: Describe (p
o
s
si
b
l
e)
g
itweb
.
js minification
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Documentation: x
m
lto
0
.
0
.
1
8
d
oes not know --stringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
Fix
crash
e
r on en
c
ounter
i
ng SH
A
1-like non-
n
ote in notes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
B
r
andon Case
y
t9001: use ol
d
er Getopt::Long boolea
n
prefix
'--n
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Bra
n
d
o
n Casey
t42
0
1: use ISO88
5
9-1 r
a
ther than ISO-8859-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jan Krüger
pull: cla
r
ify ad
v
ice
f
or th
e
uncon
f
igured error case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C H
a
m
ano
Merge in 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o C Ham
a
no
G
i
t
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Unconditiona
l
ly
s
e
t man
.
base
.
url
.
for
.
relative
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Documen
t
ati
o
n/Make
f
ile: allow man
.
base
.
url
.
for
.
relat
i
ve
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Git 1
.
6
.
6-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Ho
r
s
t
H
.
von Brand
git-pull
.
sh: Fix call
t
o
g
i
t
-merge
f
or new comm
a
nd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io C Hamano
M
er
g
e br
a
nch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
P
r
epare for 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C
Hamano
mer
g
e:
d
o not add standa
r
d m
e
ssage when message i
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
H
a
mano
D
o
no
t
misidentify "
g
it merge
foo HEAD" as an ol
d
-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C Haman
o
Update draft rel
e
ase notes
t
o 1
.
6
.
6 before -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C Hama
n
o
Merge
b
ranc
h
'maint'
commit
|
commitdiff
|
tree
2009-12-01
Junio
C Hamano
Merg
e
bran
c
h
'
jc/depr
e
cate-
o
ld-sy
n
tax-from-me
r
ge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ham
a
no
git-
m
erge: a deprecation notic
e
of th
e
a
ncient command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio C
Hamano
Merge
b
ranc
h
'bw/remote-get-r
e
f-state
s
-
fix'
commit
|
commitdiff
|
tree
2009-12-01
Bert
W
esarg
get
_
ref_states: s
t
rdup
e
ntrie
s
and fre
e
ut
i
l in st
a
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
D
a
vid Aguilar
help: Do not unn
e
cessarily loo
k
for a re
p
ository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Michael
J
G
r
u
b
er
D
o
cumentation: Fix a few
i
.
e
.
/e
.
g
.
mix-ups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge branch 'jn/
g
itweb-blame'
commit
|
commitdiff
|
tree
2009-12-01
Jakub
N
arebsk
i
gi
t
w
eb: Add link to other blame
i
mplementation in bla
m
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
J
akub
N
arebski
gi
t
web: Make li
n
king t
o
actions requiring JavaScr
i
pt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
amano
Merge b
r
anch 'fc/m
a
int-
f
o
rmat-patch-pa
t
hs
p
ec-das
h
es'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
Hamano
Me
r
ge bra
n
ch '
m
m/m
a
int-
m
erge-ff-error
-
mess
a
ge-fi
x
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
am
a
no
M
erge branch 'ap/ma
i
nt-me
r
ge-
s
trategy
-
list-fix'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C Hamano
Merge branch 'jc/pr
e
tty-lf'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C Ham
a
no
Me
r
ge b
r
anch 'cc/bisect-do
c
'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C Hamano
Merge branch 'em/comm
i
t
-
claim
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
M
e
rge b
r
anch '
j
c/m
a
ilinfo-rem
o
ve-br
a
ckets'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge
branch 'fc/s
e
n
d
-email
-
enve
l
ope'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
M
e
rge
b
ranch 'uk/maint-shortl
o
g
-
encod
i
ng'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Ham
a
no
M
e
r
g
e
branch 'ns/se
n
d
-email
-
no-chain-reply-
t
o'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C
H
aman
o
Merge branc
h
'jc/
m
aint-am-keep'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C Hamano
Merge branch
'bw/
d
iff-color-
h
unk-header'
commit
|
commitdiff
|
tree
2009-11-30
David Soria Parra
Docume
n
tation: Do
c
u
m
ent -
-
b
ranch op
t
ion in git clone
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
M
a
t
t
hieu M
o
y
builtin-merge: s
h
ow us
e
r-friendly
e
rro
r
messages for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matth
i
eu Moy
merge-
r
ecursive: make the
error-me
s
s
a
ge g
e
neration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Ma
t
thew
Og
i
l
vie
t/README: Docum
e
n
t GIT_TEST_INSTALL
E
D
and
GIT_TES
T
_EXEC_
P
ATH
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
M
a
tthew
O
g
i
lvie
t3409 t4107
t7406 t9150
:
use dashless commands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
A
v
ery Pe
n
narun
builtin-merge
.
c: call exclude_cmds(
)
correctly
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matthew
O
gilvie
t2300:
us
e
documented
t
e
c
hnique to invoke git-sh-setup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-29
Nanako Shiraishi
prepare
send-e
m
ai
l
for smooth
e
r change of -
-
ch
a
in-
r
e
p
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next