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
Teach 'git merge' and 'git pull' the option --ff-only
2009-10-30
B
j
örn Gustav
s
s
on
Teach 'g
i
t merge' and 'gi
t
pull' the op
t
ion --ff-on
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-28
Ju
n
io C Ham
a
n
o
M
e
rge branch
'
mai
n
t'
commit
|
commitdiff
|
tree
2009-10-28
David Brown
commit: More gen
e
rous accepting of RFC-
2
82
2
footer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-28
Markus Heidelberg
bash c
o
mpleti
o
n:
d
ifftool accepts the same
o
p
tio
n
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-28
J
o
ha
n
n
e
s Schindelin
h
e
l
p
-a: do not unnecessarily l
o
ok
f
or a r
e
po
s
ito
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-28
Björ
n
Gustavsson
bash: c
o
mplete more options f
o
r 'git
rebase'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-28
J
u
nio C Haman
o
Merge br
a
nch 'maint-1
.
6
.
4' into maint
commit
|
commitdiff
|
tree
2009-10-28
Sebasti
a
n Sc
h
ubert
h
Do not tr
y
to r
e
move directories when remo
v
ing old
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-28
J
an Krüger
rebas
e
-i: more graceful handling of in
v
alid commands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-28
Gerrit Pape
help -i: pr
o
perly error out if no inf
o
vi
e
wer
can be
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-27
Jun
i
o C Ha
m
a
n
o
Mer
g
e git://git
.
bogom
i
ps
.
o
rg/git-svn
commit
|
commitdiff
|
tree
2009-10-27
Ju
n
i
o C Ham
a
no
M
erge gi
t
://repo
.
or
.
c
z/gi
t
-gui
commit
|
commitdiff
|
tree
2009-10-26
Junio C
H
ama
n
o
Update draft release notes to 1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-26
Junio C Hamano
Merge
b
r
anc
h
'sb/gitw
e
b
-link-author'
commit
|
commitdiff
|
tree
2009-10-26
Junio C Hamano
Merge b
r
anch 'jk
/
ma
i
nt-cvs
i
mport
-
pat
h
name'
commit
|
commitdiff
|
tree
2009-10-26
Junio C Hamano
Merge branc
h
'
iv/tar-lzma-xz
'
commit
|
commitdiff
|
tree
2009-10-26
Junio
C
Hamano
Merge
branch
'
b
g/clon
e
-doc'
commit
|
commitdiff
|
tree
2009-10-26
Junio
C Ham
a
no
Merge b
r
anch 'jc/receive-pa
c
k-auto
'
commit
|
commitdiff
|
tree
2009-10-26
Junio C Haman
o
Mer
g
e branch 'jc/fsck-d
e
f
a
ult-full'
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
Junio C Hamano
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/m
a
int-fix-unpa
c
k-zl
i
b-check' into
.
.
.
commit
|
commitdiff
|
tree
2009-10-25
Junio C Ha
m
ano
Merge branch 'ma
i
n
t-1
.
6
.
4'
int
o
maint
commit
|
commitdiff
|
tree
2009-10-25
Junio C Hamano
Merge branch '
j
k/maint-1
.
6
.
3-ls-fil
e
s-no-ignore-c
a
ched
.
.
.
commit
|
commitdiff
|
tree
2009-10-25
Ju
n
io C Ha
m
ano
Merge branch 'jn/ma
i
nt-1
.
6
.
3
-check-re
f
-for
m
at-doc'
.
.
.
commit
|
commitdiff
|
tree
2009-10-25
Junio C H
a
m
a
no
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-10-25
Markus Heidelber
g
t
7
800-difftool
:
fix
t
he effectle
s
s GIT_DIFFTOOL_PROMPT
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-24
An
d
reas Sch
w
a
b
Work around option p
a
rsing bug
in
t
he bu
s
y
b
ox tar implementation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-24
Junio C Hamano
Merge
b
ra
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-10-24
Ju
n
io C Hamano
Fix
list o
f
released vers
i
o
n
s in t
h
e toc docume
n
t
commit
|
commitdiff
|
tree
2009-10-24
Junio C Hamano
M
e
rge
b
ranch 'jp/
m
aint-send-email-fold' into maint
commit
|
commitdiff
|
tree
2009-10-24
Junio C
Hamano
Merge bran
c
h
'jn/maint
-
1
.
6
.
3
-
check-ref-format-doc'
.
.
.
commit
|
commitdiff
|
tree
2009-10-24
Junio C Hama
n
o
Merge branch
'pv
/
maint-a
d
d-p
-
no-exclu
d
e'
i
nto maint
commit
|
commitdiff
|
tree
2009-10-23
Junio C Hamano
Do not fail "d
e
s
c
r
i
be --always" in a tag-less repository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-22
Ju
n
io C Hamano
F
ix incorre
c
t error c
h
eck
w
hi
l
e r
e
adi
n
g
d
eflate
d
pac
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-22
Junio C Ham
a
no
Me
r
g
e branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2009-10-22
Jun
i
o
C
Ha
m
ano
Merge b
r
a
n
ch 'gb/maint-gitweb-esc-param'
commit
|
commitdiff
|
tree
2009-10-22
Björn Gustavsson
gi
t
-c
l
one
.
txt: Fix grammar and for
m
a
t
ting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-22
Ingmar Vanhassel
impo
r
t-tars: Add
support for tarballs compress
e
d with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-21
Juni
o
C Hamano
re
c
e
i
ve-
p
a
c
k
:
run "
g
c --auto --quiet" an
d
optionally
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-21
Junio C Ha
m
ano
gc --auto --quiet: make the notice a bit less verboase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-21
N
asser Grainawi
Doc
u
ment
`
delta` attri
b
ute in "git help attributes"
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-21
Johanne
s
Sixt
Mar
k
fil
e
s in t/t5100 as
U
TF-8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-21
Johann
e
s
Sixt
Remove a
l
eft-over fi
l
e
f
ro
m
t/t5
1
00
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-20
Junio C Hamano
fsc
k
: default to
"
git fsck --
f
ul
l
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-20
Junio
C
Hamano
Me
r
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-10-20
S
tephen B
o
yd
gitweb
:
l
i
nki
f
y a
u
thor/c
o
mmitt
e
r names with search
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-20
Matt
K
r
aai
Docum
e
ntation/g
i
t-gc
.
txt
:
change "referenc
e
s" to "refer
e
nce"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-19
Junio C Haman
o
M
erge bra
n
ch '
b
g
/r
e
b
a
s
e-rew
o
r
d
'
commit
|
commitdiff
|
tree
2009-10-19
Stephen Boyd
rebase -i:
f
ix reword
when using a terminal editor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-19
Junio C
Hamano
fo
r
mat_commit_m
e
s
sa
g
e(
)
: fix
f
u
nctio
n
signatu
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-19
Jeff King
cvsimport: f
i
x relative arg
u
m
e
nt filenam
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-19
J
u
n
io
C
Hamano
Merge
b
ra
n
ch 'jp/maint-
s
end-em
a
il-fold'
commit
|
commitdiff
|
tree
2009-10-19
J
u
n
io C Hamano
Merge b
r
anch 'cc/repla
c
e
-
no-replace
'
commit
|
commitdiff
|
tree
2009-10-19
Jun
i
o
C
Hamano
Merge branch '
j
n
/
maint-1
.
6
.
3-check-
r
ef-format-doc'
commit
|
commitdiff
|
tree
2009-10-19
Junio C Hamano
Merg
e
bra
n
ch 'jk/maint-1
.
6
.
3-ls
-
f
i
les-no-igno
r
e-cached'
commit
|
commitdiff
|
tree
2009-10-19
Juni
o
C Hamano
Merg
e
branch 'jn/gitweb-show
-
size'
commit
|
commitdiff
|
tree
2009-10-19
J
un
i
o
C
Hamano
Mer
g
e bra
n
ch 'jp/fetch-tag-match'
commit
|
commitdiff
|
tree
2009-10-19
Junio C Hamano
M
e
r
ge branch 'jn/
g
itweb-patch'
commit
|
commitdiff
|
tree
2009-10-19
Junio C Hamano
Merge bran
c
h
'tf
/
doc-pt-br'
commit
|
commitdiff
|
tree
2009-10-19
Junio C
H
a
m
an
o
Merge branc
h
'd
k
/
b
lame-el'
commit
|
commitdiff
|
tree
2009-10-19
Junio C Hamano
M
e
rge
branch 'mr
/
instaweb-cgi
d
'
commit
|
commitdiff
|
tree
2009-10-19
René Scharf
e
describe: load refnames be
f
or
e
calling describe()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-19
Jun
i
o
C
H
am
a
no
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-10-19
Nanako Sh
i
raishi
g
i
t push:
s
ay
t
h
at
--tag can't be us
e
d with --all or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-19
N
a
nako Sh
i
raishi
git p
u
sh: remove incomplete opti
o
ns list from help
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-19
Jeff
K
ing
document push's
n
ew quiet option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-19
Carlos R
.
Mafra
Makefile: clean bl
o
ck
-
sha1/
d
irec
t
ory i
n
stead of m
o
zilla
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-17
Junio C
H
amano
Start 1
.
6
.
6
c
y
c
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-17
Junio C Hamano
Merge branch 'j
c
/maint-bl
a
nk-
a
t-e
o
f'
commit
|
commitdiff
|
tree
2009-10-17
J
unio C
H
amano
M
erge br
a
nch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2009-10-17
Juni
o
C Hamano
GIT
1
.
6
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-17
Junio C
H
amano
Me
r
ge branch
'mai
n
t-1
.
6
.
4' into maint
commit
|
commitdiff
|
tree
2009-10-17
Matt Kraai
gr
e
p: d
o
n
ot
segfaul
t
w
h
e
n -
f
is use
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-14
Juni
o
C Hamano
Merge
b
ran
c
h 'pv/maint-add-p-no-exclud
e
'
commit
|
commitdiff
|
tree
2009-10-14
Junio C Ham
a
n
o
Merg
e
branch 'main
t
'
commit
|
commitdiff
|
tree
2009-10-14
Sh
a
wn O
.
Pearce
s
h
a1_f
i
le: Fix
infinite loop when pack
is corrupted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-14
Junio C Ham
a
n
o
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2009-10-14
Ni
c
olas Pit
r
e
cha
n
ge thr
o
ug
h
put
d
isplay units with fast li
n
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-14
B
j
ö
rn St
e
inbrink
c
lone: Su
p
ply the righ
t
commit hash to po
s
t
-
checkout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-14
Giuseppe
Bilotta
gitweb: fix esc_p
a
r
am
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-14
Johannes
Sixt
remote-curl
:
add miss
i
n
g initializatio
n
of
a
rgv0_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-13
Christia
n
Couder
git: add --no-replace-objects op
t
i
o
n to disable
r
e
p
lacing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-13
J
u
nio
C
H
amano
Me
r
ge branch
'
maint'
commit
|
commitdiff
|
tree
2009-10-13
J
unio C Hamano
M
erge branch 'maint-1
.
6
.
4' i
n
to maint
commit
|
commitdiff
|
tree
2009-10-12
Jonathan Nieder
Documentation: describe che
c
k-ref-fo
r
m
at
-
-b
r
anch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-12
Thomas Rast
Let --decor
a
te s
h
o
w HEAD
p
osi
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-12
M
i
k
los Vajna
git-st
a
sh documentation: me
n
t
i
o
n defa
u
lt op
t
ions fo
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-12
Thomas Ras
t
bash comple
t
i
on: complete refs for
g
it-grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-12
Je
f
f K
i
ng
ls-f
i
les: exclude
s
should not im
p
ac
t
t
r
a
c
k
ed files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-12
Felipe
Contreras
d
i
f
f
.
c:
st
y
l
e
fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-12
SZED
E
R
G
ábo
r
D
ocu
m
en
t
ation: add
'
git rep
l
ace' t
o
main git manpa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-10
Pauli Virtanen
git-add--interact
i
ve: n
e
ve
r
skip
f
i
les inclu
d
ed
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-10
Ju
n
io C H
a
ma
n
o
GIT 1
.
6
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-10
S
i
mon
Arl
o
tt
git-s
v
n: hide
find
_
par
e
n
t
_branch
output in double
quiet
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-10
Jo
n
athan Nieder
Documentation: clone: c
l
arify disc
u
ssion
o
f init
i
al
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-10
Joe Per
c
hes
git-se
n
d
-emai
l
.
perl: fold m
u
ltiple entry
"Cc:" and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
J
unio
C Hamano
Merge branch 'rs/maint-ar
c
hive-prefix'
commit
|
commitdiff
|
tree
2009-10-09
Junio
C
H
a
mano
Merge branc
h
'fc
/
mutt-alias'
commit
|
commitdiff
|
tree
2009-10-09
Junio C
Hamano
M
erge bran
c
h
'ef/msvc-noretu
r
n'
commit
|
commitdiff
|
tree
next