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
Make git-pull complain and give advice when there is nothing to merge with
2007-10-03
Federico Mena Quintero
Make git-pull compla
i
n and give advice
w
he
n
the
r
e
i
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-10-03
Federico
M
ena Q
u
intero
Not
e
that
g
it-branch will not
automaticall
y
checko
u
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-10-03
Federico Mena Quin
t
ero
Add documentation f
o
r
--track an
d
--no-track to the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-10-03
F
ederico
Mena
Q
uintero
S
a
y w
h
en --trac
k
i
s useful i
n
the
g
i
t-c
h
eckout docs
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-10-02
J
o
hannes Sch
i
nd
e
lin
F
i
x
typo in config
.
tx
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-10-02
Jun
i
o C Ham
a
no
for-each-r
e
f: fix %
(
n
u
mpare
n
t)
and %(pare
n
t)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-10-02
Junio C
Hamano
git-commit: initiali
z
e TMP
_
INDEX just
t
o
be sure
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-10-02
Steffen Prohaska
f
ixed link in documentation of diff-op
t
io
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-10-01
Junio C Hamano
W
hi
p
post 1
.
5
.
3
.
3 mainte
n
ance se
r
ies in
t
o shape
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajna
git stash: document apply's --in
d
ex switch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-10-01
Andy Parkins
post-re
c
ei
v
e
-hook: Remove
t
h
e Fro
m
field from the ge
n
era
t
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-30
Jari Aalto
git-remote: exit
with no
n
-zer
o
status aft
e
r
detecting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-30
Joha
n
nes Schin
d
elin
rebase -i: sq
u
ash
should retain the author
s
hip
o
f
th
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-30
Jean
-
Luc
H
er
r
en
git-add-
-
inte
r
active: Improve behavio
r
on bogus in
p
ut
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-30
Jean-Luc
Herren
g
i
t-add--interactive: Allow Ctr
l
-D to exi
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-29
J
u
nio C
H
amano
GIT 1
.
5
.
3
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-29
Linus T
o
r
v
alds
Fix revis
i
on log
d
iff set
u
p,
a
v
oid u
n
neces
s
ary diff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-29
Miklos V
a
jna
git-bundle
:
fix comm
a
ndline examples in the manpag
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-29
J
unio
C
H
amano
Merge
b
ranc
h
'mergeto
o
l' of git://rep
o
.
or
.
cz/git/mergetool
.
.
.
commit
|
commitdiff
|
tree
2007-09-27
Dan Nicholson
quiltimport: Skip no
n
-ex
i
stent patches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-26
Johannes
Schindelin
apply: get rid of
-
-
index-info in
fav
o
r of -
-
build
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-26
Carlos
Rica
Move make_cache_entry() from merge-recursive
.
c int
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-26
Ran
d
y Dunlap
core-tutorial: cor
r
ect UR
L
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-26
Shawn Bohrer
Fix spelli
n
g of
o
verridden in d
o
cum
e
n
tation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-26
Johannes Sixt
g
i
t
a
t
tributes
.
txt: Be m
o
re to the point in t
h
e
f
ilter
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-26
J
ohanne
s
Sixt
gita
t
tributes
.
t
x
t
: Remo
v
e a duplicated paragraph
about
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-26
Mic
h
ael Smith
u
s
er-
m
anual: E
x
plai
n
what submodules ar
e
good for
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-25
Junio C H
a
man
o
Merge branch 'jn/web' into main
t
commit
|
commitdiff
|
tree
2007-09-25
Ji
m
Meyering
Do not o
v
er-qu
o
te the -
f
en
v
elopesender value
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-25
Jim Meyeri
n
g
unexpecte
d
Make
output (e
.
g
.
from -
-
debug) c
a
u
se
s
b
uild
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-25
Glenn Rem
p
e
Fixed mino
r
typo in t/t9001-send-emai
l
.
sh test
c
ommand
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-24
J
akub Na
r
eb
s
ki
gitweb: No difftree
o
utput for tri
v
ial merge
commit
|
commitdiff
|
tree
2007-09-24
Jakub
Narebsk
i
gitweb: Remove
p
arse_from_to_diffinfo code
f
rom git
_
patc
h
s
e
t
.
.
.
commit
|
commitdiff
|
tree
2007-09-24
J
u
nio C Hamano
Merg
e
bra
n
ch 'maint' of
g
it://linux
-
n
f
s
.
o
r
g/~bfield
s
.
.
.
commit
|
commitdiff
|
tree
2007-09-24
E
r
ic Wong
git-svn: d
o
n'
t
attempt to spawn pager if w
e
don't wan
t
one
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-23
Da
v
id Kastrup
Supplant the "wh
i
l
e case
.
.
.
brea
k
;
; e
s
ac"
i
dio
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-22
D
a
vid Brown
D
e
tect exec bit in mo
r
e cases
.
commit
|
commitdiff
|
tree
2007-09-21
Matt Kraai
Conjugate
"sear
c
h" correctly in th
e
g
i
t-prune-pa
c
ked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-21
Matt
K
ra
a
i
Mov
e
the pa
r
agrap
h
s
p
ecifyi
n
g w
h
ere the
.
idx and
.
pack
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-21
Junio
C
Hamano
Documentation/git-lost-found
.
tx
t
: drop
unnecessarily
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-19
Jun
i
o C
H
amano
GIT 1
.
5
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-19
Väinö
Järvel
ä
Fixed u
p
date
-
h
ook example allow-u
s
ers form
a
t
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-19
Eric Wong
D
oc
u
mentation/gi
t
-
s
vn: updated design philosophy notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-18
Junio C Hamano
t/t4014: test "am -3"
w
it
h
mo
d
e
-only ch
a
nge
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-18
Pierre Ha
b
ou
z
it
Fix la
p
sus in buil
t
in-
a
pply
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-18
Jeff
King
git-pu
s
h: do
c
um
e
ntation and tests for pushing only
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-18
Ma
t
th
i
a
s
Urlichs
gi
t
-
svnimport:
Use sepa
r
ate arguments in the pipe
f
or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-18
Junio C Ham
a
no
D
oc
u
m
e
nt ls-files --with-tree=<
t
ree-ish>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-18
Junio C Hamano
git
-
c
ommit: pa
r
tial
c
ommit o
f
paths
only removed from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-18
Jun
i
o
C
Hamano
git-co
m
mit: Allow partial
c
ommit
o
f
file re
m
o
v
al
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-18
Junio C Hamano
M
erge branch 'jc/grep-c' into ma
i
n
t
commit
|
commitdiff
|
tree
2007-09-18
Junio C Hamano
M
e
rge b
r
anch 'maint'
o
f g
i
t://repo
.
or
.
c
z/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-09-18
Junio C Hamano
s
en
d
-em
a
il: make message-id generation
a bit m
o
re robust
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-17
J
.
Bruce Fields
git-apply: fix whitespace
s
tripping
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-17
J
ohanne
s
Schindelin
appl
y
--index-info: fa
l
l
back to current in
d
ex f
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-16
Junio C Ha
m
ano
Merge bra
n
ch 'maint'
o
f
g
i
t:/
/
linu
x
-nfs
.
org
/
~bfi
e
l
d
s
.
.
.
commit
|
commitdiff
|
tree
2007-09-15
Johannes Schindelin
revi
s
ion walker: -
-
cherry-pick is a
l
imited op
e
r
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-15
J
unio C Hamano
git-
s
h-setup: typofix in
comments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
Junio C
Hamano
Split grep
a
r
guments in
a way that does not requires
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
Junio
C Ham
a
no
D
o
cumenta
t
ion
/
gi
t
-
c
on
f
ig
.
txt:
A
scii
D
oc tweak to avoid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
Benoit
S
igoure
Add test to ch
e
c
k recent fix to "git a
d
d -u"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
J
ari Aalto
Documen
t
ation/git-archive
.
txt: a
c
ouple of
c
larifications
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
Linu
s
Torvalds
Fix
t
he rename
detection limit checking
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
Ju
n
io C Hamano
diff --no-index
:
do
n
o
t fo
r
g
e
t to ru
n
diff
_
setup
_
done(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
Junio
C Haman
o
git-
f
o
r
mat-
p
atch --in
-
reply-to:
a
ccept <me
s
sage@id
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
Junio C Ham
a
no
git-add
-u: do not
barf on type changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
U
l
rik Sverdrup
R
e
move duplic
a
t
e
note abou
t
rem
o
vin
g
commits w
i
th git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
Ger
r
i
t
Pape
g
it-clone: improve
e
rror message if curl program is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
A
l
ex
a
ndre Jull
i
ar
d
hooks--upda
t
e: Ex
p
licitly check for al
l
zeros for
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-12
Juni
o
C Hamano
Merge branch
'
s
p
/
m
aint-no-thin' into mai
n
t
commit
|
commitdiff
|
tree
2007-09-12
Jean-
L
uc He
r
ren
s
t
a
sh:
end index commit log wit
h
a newline
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-12
Dmitry V
.
Levin
g
i
t-co
m
mit:
Disa
l
low
a
mend if it is g
o
ing
t
o
produ
c
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-12
David Kastrup
git-send-email
.
perl: Add angle brackets to
In-Reply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-12
Ramsay
Jones
Fix a t
e
st
fai
l
ure (t9500-*
.
sh)
on cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-10
Shawn O
.
P
e
arce
M
a
k
e --no-thin the default i
n
git
-
pus
h
to save server
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-10
Nicolas
P
itre
fi
x
doc for --compression argument to pack-objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-10
Carlos Rica
git-tag -s
m
u
s
t f
a
il if gpg cannot s
i
g
n
the t
a
g
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-09
Eric Wong
git-svn:
u
nderstand gra
f
ts when
do
i
ng
d
commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-09
Sven Verdo
o
l
a
e
ge
g
i
t-
d
iff:
d
on't squ
e
l
ch the new SHA1 in submod
u
le diffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-08
E
ric
Wong
g
i
t
-svn: fix
"Malfo
r
med netwo
r
k data"
with svn:// servers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-08
M
i
chael
S
mith
(cvs
|
svn)import: As
k
git-
t
ag to overwrite old tag
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-08
Mike Ralphson
Documentat
i
on / grammer nit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-06
Shawn O
.
Pearce
In
c
l
ude a g
i
t-push
examp
l
e for c
r
ea
t
ing a re
m
ote branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-06
S
h
awn O
.
Pearce
Cleanup unnecessary
file modifications in
t
1400-update
-
ref
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-06
Dmitry V
.
Levin
M
akefile: Add c
a
che-tree
.
h
to the headers list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-06
Shawn
O
.
Pear
c
e
Don't allow
c
ontrib/workdir/git-new-workdir to tr
a
sh
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-06
Ju
n
io
C Ha
m
ano
git-apply: do not read pas
t
the end o
f
buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-03
Junio C Hamano
GIT 1
.
5
.
3
.
1: obso
l
et
e
git-p4 in RPM spec file
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-02
Jun
i
o C Ham
a
no
Typofix:
1
.
5
.
3 release notes
commit
|
commitdiff
|
tree
2007-09-02
Junio C Hamano
GIT
1
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-01
Junio C Ham
a
no
Merge bran
c
h
'
jp/send-ema
i
l-cc'
commit
|
commitdiff
|
tree
2007-09-01
Robin Ros
e
nberg
Mentio
n
-m as an ab
b
r
eviation for --merg
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-01
J
unio C Hamano
Update my
c
on
t
ac
t
address as the maintainer
.
commit
|
commitdiff
|
tree
2007-09-01
Junio C Hamano
D
ocu
m
e
n
tation: minor AsciiDoc m
a
r
k
-up fixes
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-01
L
u
ben Tuik
o
v
URL: allow po
r
t specification in ssh://
U
R
Ls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-01
Junio C
H
amano
Avo
i
d one-or-more (\+)
n
on BRE in
s
ed scri
p
ts
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-01
Johannes Sixt
rebase -m: Fi
x
incorrect short-logs of already appli
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-01
Junio
C
Hamano
git-diff: resurrect
t
he
t
rad
i
tional
e
m
p
ty "
d
iff -
-
g
it
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-01
Carlos Ri
c
a
git
-
tag: F
i
x -l
o
ption to use better shell style globs
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-01
Eric Wong
g
i
t-svn: fix dcommit c
l
o
b
bering upstream w
h
en
c
ommit
t
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next