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
bash: add the merge option --ff-only
2009-11-14
Bj
ö
rn
G
u
stavsso
n
bash:
add the me
r
ge option --ff-only
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-11
Junio C
H
ama
n
o
Merge b
r
an
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2009-11-11
Junio C
Hama
n
o
chec
k
-ref-forma
t
-
h:
i
t does not know the
-
-print o
p
ti
o
n yet
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-10
Junio C Hamano
gi
t
-
describe
.
txt: f
o
rmatting
f
ix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-10
J
u
nio C
H
amano
Merge
b
ranch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-11-10
Ju
n
io C Hamano
M
e
r
ge branch 'jk/maint-format-patch-
p
-suppre
s
s-stat'
commit
|
commitdiff
|
tree
2009-11-10
Junio
C
Hamano
Merge branch 'pb/maint-gitweb-blob-lin
e
no'
commit
|
commitdiff
|
tree
2009-11-10
Junio
C Ham
a
no
Merge branch 'tr/describe-
a
dvice'
commit
|
commitdiff
|
tree
2009-11-10
Junio C Hamano
Mer
g
e branch 'jk/maint-1
.
6
.
3
-ls-
f
iles
-
i'
commit
|
commitdiff
|
tree
2009-11-10
Junio C
H
a
m
ano
Mer
g
e branch 'bg/merge-ff-only'
commit
|
commitdiff
|
tree
2009-11-10
J
u
nio C Hamano
Merge br
a
n
c
h 'vl/maint-openssl-signature-change'
commit
|
commitdiff
|
tree
2009-11-10
Junio C Ha
m
ano
Merge bran
c
h
'
jk/maint-p
u
s
h
-conf
i
g'
commit
|
commitdiff
|
tree
2009-11-10
Jun
i
o C
H
am
a
no
M
e
rge branch 'jk/gi
t
ign
o
re-anchored'
commit
|
commitdiff
|
tree
2009-11-10
Junio
C
H
a
mano
Merge branch 'jp/dirty
-
d
e
s
cribe'
commit
|
commitdiff
|
tree
2009-11-10
Junio C
Hamano
Merge
b
ranch 'sr/
b
la
m
e-i
n
compl
e
te'
commit
|
commitdiff
|
tree
2009-11-10
Jonath
a
n Ni
e
der
merge: do not setup w
o
rktree twice
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonat
h
a
n Nieder
check-ref-for
m
at: update u
s
age string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-10
Štěp
á
n Němec
git-
u
pdat
e
-
index
.
txt: Document the
-
-really-refresh
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-09
Junio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2009-11-09
Jonath
a
n Nieder
A
dd inte
r
mediate
b
u
i
ld products to
.
g
i
t
i
g
nore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-09
Jeff King
forma
t
-pa
t
ch
:
ma
k
e "-p" suppress diffstat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-07
Junio C Hamano
Merge branch
'
jc/commi
t
-s-subject-
i
s
-not-a-footer'
commit
|
commitdiff
|
tree
2009-11-07
Junio C Hamano
builtin-
c
om
m
it
.
c: fix logic to omit empty line b
e
fore
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-06
Petr Baudis
gitweb: Fix b
l
ob linenr links in pa
t
hinfo mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-06
Nicolas Pitre
p
ack-objects: move threa
d
autod
e
tectio
n
c
loser to relevan
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-05
Junio C Hama
n
o
Me
r
ge branch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2009-11-05
Gisl
e
Aas
Fix docu
m
enta
t
i
on
g
rammar typ
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-04
Daniel Barkalow
Allow
curl h
e
lper to work wit
h
out a
l
ocal reposi
t
ory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-04
D
aniel Barkalow
Requ
i
re a st
r
u
c
t remote in transport
_
get()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-02
J
unio C
H
amano
Merge branch 'jn/show-normalized
-
r
efs'
commit
|
commitdiff
|
tree
2009-11-02
Stephen Boyd
t1402:
M
ake t
e
st ex
e
cutable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-02
Junio C Ham
a
no
Mer
g
e
branch 'bg
/
c
l
one-d
o
c' into m
a
int
commit
|
commitdiff
|
tree
2009-11-02
Junio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2009-11-02
Dmitry V
.
Levin
Makefi
l
e: add compa
t
/bswap
.
h to LIB_H
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-31
Vietor Li
u
ima
p
-
s
end
.
c: fix c
o
mpil
e
r warning
s
for OpenS
S
L 1
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-31
Junio C Hamano
Reve
r
t "Don't creat
e
the $G
I
T_DIR/branche
s
directory
.
.
.
commit
|
commitdiff
|
tree
2009-10-31
Junio C Hamano
fixup t
r
/
s
t
ash-form
a
t merge
commit
|
commitdiff
|
tree
2009-10-31
J
u
nio C Hamano
Merge br
a
nch 'js/diff-verbose-submodu
l
e'
commit
|
commitdiff
|
tree
2009-10-31
Junio C Hamano
Merge branch 'jc/check
o
ut-auto-tra
c
k'
commit
|
commitdiff
|
tree
2009-10-31
Juni
o
C Hamano
M
erge br
a
nch 'jn/show-normalized-r
e
fs
'
commit
|
commitdiff
|
tree
2009-10-31
Junio C Haman
o
M
erge branch 'jc/maint
-
1
.
6
.
3-graf
t
-trailing-space
'
commit
|
commitdiff
|
tree
2009-10-31
J
unio
C Hamano
Mer
g
e br
a
nc
h
'ak/b
i
sect-reset-to
-
sw
i
tch
'
commit
|
commitdiff
|
tree
2009-10-31
Juni
o
C
Hamano
Merge
b
ranch 'tr/main
t
-
roff-quote'
commit
|
commitdiff
|
tree
2009-10-31
J
unio C Hama
n
o
M
e
rge branch 'ja/fe
t
ch-
d
oc'
commit
|
commitdiff
|
tree
2009-10-31
Junio C
H
amano
Merge
branch
'
cb/doc-
f
e
t
ch-pull-merge'
commit
|
commitdiff
|
tree
2009-10-31
Juni
o
C
Haman
o
Merg
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2009-10-30
Björn Gusta
v
sson
T
e
ac
h
'git merge' and '
g
it pul
l
' the opt
i
on
-
-ff
-
only
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-30
Jo
n
athan Nied
e
r
clone:
d
e
t
ect e
x
tr
a
a
r
guments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-30
J
u
nio C H
a
m
a
no
cl
o
ne: fix help
on optio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-30
Jeff King
push: fix t
y
po in usa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-30
Jeff King
t915{0,1}:
use $TEST_D
I
RECTORY
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-30
Michael J Gruber
Mak
e
t9
1
50 and t9151 test s
c
ripts
executa
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-30
Gisle Aa
s
More precise de
s
cr
i
pt
i
on of 'git
d
escribe --abbrev'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-30
Jeff King
ls
-
files: unbreak "ls-files -i"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-30
R
o
bin
Rosenb
e
rg
Don't c
r
eate the $GIT_DIR/branches di
r
ec
t
o
r
y
o
n
i
n
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-30
Sebastian
S
ch
u
berth
Make the MSVC projects use PDB/IDB f
i
les name
d
after
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-30
Seba
s
tian Schuberth
Use faster byt
e
sw
a
pping wh
e
n compili
n
g
wit
h
MSVC
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-28
Thom
a
s Rast
des
c
ribe: w
h
e
n
failing, tell the
user about options
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-28
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-10-28
Davi
d
Brow
n
commit: More generous accepting of RFC
-
282
2
footer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-28
M
arkus Heid
e
lber
g
bash
c
ompletion: difftool ac
c
ept
s
th
e
same o
p
tions
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-28
J
o
h
a
nnes
Sc
h
indelin
help
-a: d
o
not un
n
ecessarily look
for a repos
i
tory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-28
Björn
Gustavsson
bash: comple
t
e more
op
t
ions for
'
git
r
ebase'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-28
Junio C
H
aman
o
Merge branch '
m
a
i
nt-1
.
6
.
4' int
o
maint
commit
|
commitdiff
|
tree
2009-10-28
Sebastian Schuber
t
h
Do
n
ot try to
r
emov
e
directories whe
n
r
e
moving old
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-28
Jan
Krüger
r
ebase -i:
m
ore
graceful
h
andling of i
n
va
l
id commands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-28
Gerrit Pape
help -i: pro
p
er
l
y
err
o
r out if no info viewer can be
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-28
Jeff King
gitignore:
root most patterns at the top-level directo
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-27
Junio C Hamano
Merge git://
g
it
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-10-27
Junio C Hamano
M
e
rge gi
t
://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-10-27
Jean P
r
ivat
T
e
a
c
h
"
git descr
i
be" --dirty option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-26
Jeff King
push
:
always
l
oad default conf
i
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-26
Junio C Hama
n
o
Up
d
at
e
draft relea
s
e no
t
es
t
o 1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-26
Junio C Hamano
Mer
g
e
branch 'sb/gitweb-link-a
u
thor'
commit
|
commitdiff
|
tree
2009-10-26
Ju
n
io C Hamano
M
erge branch 'jk/maint-cvsimp
o
rt-pat
h
name'
commit
|
commitdiff
|
tree
2009-10-26
J
u
nio C Hamano
Merge
b
ranch 'iv/
t
ar-lzm
a
-xz'
commit
|
commitdiff
|
tree
2009-10-26
Junio C Hamano
Merge branc
h
'bg/clone-doc'
commit
|
commitdiff
|
tree
2009-10-26
Junio C
Hamano
Merge br
a
nch '
j
c/receive-pack-
a
u
to'
commit
|
commitdiff
|
tree
2009-10-26
Junio C Hamano
Merge bran
c
h 'jc/f
s
ck-default-ful
l
'
commit
|
commitdiff
|
tree
2009-10-26
Junio C Hamano
Sync with 1
.
6
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-26
J
u
nio C Ha
m
ano
GIT 1
.
6
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-26
Junio
C Hamano
Merge branch 'jc/mai
n
t
-
fi
x
-unp
a
ck-zlib-check' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-10-25
Juni
o
C Ha
m
an
o
Merge
b
r
anc
h
'maint-1
.
6
.
4' in
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2009-10-25
Junio C Ham
a
no
Merge branch 'jk
/
maint-1
.
6
.
3-ls-files-no
-
ignore-cached
.
.
.
commit
|
commitdiff
|
tree
2009-10-25
J
unio C Ham
a
no
Merge
branch 'jn/maint
-
1
.
6
.
3
-
check-re
f
-for
m
at
-
doc'
.
.
.
commit
|
commitdiff
|
tree
2009-10-25
Junio C H
a
mano
Merge br
a
n
c
h 'maint'
commit
|
commitdiff
|
tree
2009-10-25
Ma
r
k
us Heidelb
e
rg
t7
8
00
-
diffto
o
l: fix the effectless GIT_DIFFTOOL_PROMPT
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-24
Andreas
S
chw
a
b
W
o
r
k aro
u
nd opti
o
n parsing bug
i
n t
h
e b
u
sybox
tar im
p
lementa
t
io
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-24
Junio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2009-10-24
Junio
C Ham
a
no
Fix list of released
versions in
the toc docum
e
nt
commit
|
commitdiff
|
tree
2009-10-24
Junio
C Ha
m
ano
Merge br
a
nch 'jp
/
maint-sen
d
-email-fol
d
' into main
t
commit
|
commitdiff
|
tree
2009-10-24
Jun
i
o C
H
amano
Merge branch '
j
n
/
maint-1
.
6
.
3-che
c
k-ref-fo
r
ma
t
-doc
'
.
.
.
commit
|
commitdiff
|
tree
2009-10-24
J
unio C Hamano
M
erg
e
bra
n
c
h 'pv
/
ma
i
nt-add
-
p
-
n
o
-exclude' i
n
to maint
commit
|
commitdiff
|
tree
2009-10-24
J
e
ns
L
ehmann
add tes
t
s f
o
r git dif
f
--submodule
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-23
J
u
ni
o
C Hamano
Do
not fa
i
l "describe
--always" in a tag-less reposi
t
ory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-22
Thomas Ra
s
t
Quote ' as \(aq in
m
a
np
a
ges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-22
Jari Aalto
Docume
n
tation/merge-options
.
txt: order
opt
i
ons
in al
p
hab
e
tic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-22
Ja
r
i Aalto
Documentation/git-pull
.
txt: A
d
d subtitles above
included
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-22
Junio C
H
aman
o
Fix incorr
e
ct error check while readin
g
defl
a
ted
p
a
ck
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-22
Junio C Ham
a
no
Merge branc
h
'
maint'
commit
|
commitdiff
|
tree
next