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-09-01
J
u
n
i
o C Hamano
git-svn: Pr
o
tec
t
aga
i
nst "
d
iff
.
colo
r
= t
r
ue"
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-01
Johannes Schi
n
d
e
lin
filter-br
a
nch
:
introduce conv
e
nience functio
n
"
s
k
ip_commit"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-01
J
ohannes S
c
hindelin
filter-bran
c
h: provide
t
he convenience fu
n
ctions also
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-01
J
ohanne
s
Schindelin
rebase -i:
mentio
n
th
e
option
to spl
i
t commit
s
i
n the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-01
Johan
n
es Schindelin
filt
e
r-bra
n
ch: fix
re
m
nants
o
f old syn
t
ax in do
c
umen
t
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
Junio
C
Hamano
H
opefull
y
the final updat
e
to draft
release note
s
for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
Junio C Ha
m
ano
Make
"git-log --"
without paths behav
e
the same as
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
Junio C Haman
o
git-init: au
t
odetect core
.
symlin
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
Miles Bad
e
r
M
a
ke git-
a
rchimport
log entri
e
s more c
o
nsistent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
N
i
colas
Pitre
f
i
x sam
e
sized de
l
ta logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
Ju
n
io C Hamano
filter-bra
n
ch:
make sur
e
or
i
g_namespace ends w
i
th
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
Giuseppe Bilotta
git-filter-br
a
nch:
document
-
-original option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
Gius
e
p
p
e
Bi
l
otta
git-f
i
lter-branch: more detailed USAGE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
J
u
nio C Hamano
M
a
kefile:
do not a
l
low gnu make
to remove t
e
st-*
.
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
Alex Riesen
Temporary
f
i
x for stack smash
i
ng in mai
l
info
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
Tom Clarke
F
i
xing commen
t
in mer
g
e s
t
rategies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-30
Junio C H
a
mano
l
s-fil
e
s
-
-
e
rror-unmatch
:
do not barf if the same patte
r
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-29
Junio C Hamano
Mer
g
e branch 'master' of git
:
//git
.
kernel
.
org/pub/scm
.
.
.
commit
|
commitdiff
|
tree
2007-08-29
Joh
a
nnes Sch
i
n
d
e
l
in
c
o
mpletio
n
: also compl
e
te git-log's
-
-left
-
right a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-29
Jun
i
o C Ha
m
a
n
o
git-daemon(1): assorted improvements
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-29
Ju
n
io C Hamano
GIT 1
.
5
.
3-rc7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-29
David Kastrup
git-svn
.
tx
t
:
fix an
o
bvious misspe
l
ling
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-29
D
a
vid Kåge
d
al
g
it
.
el: A
d
de
d
colors for dark backgro
u
nd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-29
Junio C
H
amano
f
o
rmat-patch documenta
t
io
n
:
reword to hint
"--ro
o
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-29
Junio C Ha
m
a
n
o
M
e
rge branch 'jc/logse
m
antics'
commit
|
commitdiff
|
tree
2007-08-29
Junio C Hama
n
o
D
ocumenta
t
io
n
/
git-diff: A
.
.
B and A
.
.
.
B can
n
ot ta
k
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-29
P
e
tr Baudis
git-add: Ma
k
e
th
e
filename globbing note a b
i
t c
l
e
arer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-29
Petr Baudis
git-add: Make the "tried to add ignore
d
fil
e
" error
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-29
Jaku
b
Narebski
gitwe
b
: Fix
e
sc
a
ping HTML of p
r
oject owner in 'p
r
ojects_li
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-28
Ju
n
io C Hamano
"format
-
patc
h
--root rev" i
s
the way to show e
v
eryth
i
ng
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-28
Junio C Hamano
Porcelain
level "log" family sh
o
ul
d
recu
r
se when diffing
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-28
Junio C Haman
o
git-merge: do up
-
to-date check a
l
so for all
s
trategies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-28
Junio C Hamano
git --bare
cmd: do not
uncondi
t
ionally nuk
e
GIT_DIR
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-28
J
unio
C
Ha
m
ano
Fix
i
n
itial
i
zati
o
n
of a
b
are re
p
o
s
i
t
o
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-28
Johannes Schin
d
eli
n
name-r
e
v: Fix non-shor
t
e
s
t descrip
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-28
Mike Hommey
Describ
e
two-dot and th
r
ee-dot notation fo
r
diff endpo
i
n
t
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-27
Jari
Aalto
git-tag(1): Remo
v
e duplicate text
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-27
Petr Baudi
s
gitweb
:
L
i
f
t any characters res
t
r
i
ction on
searc
h
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-27
Junio C H
a
mano
RelNo
t
e
s
d
raft
f
or 1
.
5
.
3 update
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-27
J
unio C Hamano
M
e
rge branch 'master' o
f
g
it:
/
/repo
.
or
.
cz/gi
t
-gui
commit
|
commitdiff
|
tree
2007-08-26
B
r
ian
H
e
t
ro
When n
o
thing to
git-commit, honor the git-status colo
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-26
Petr B
a
udis
gitw
e
b: F
i
x
se
a
r
c
hbox posit
i
o
n
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-26
Junio C
H
amano
Mer
g
e b
r
a
n
ch
'
master' of git://
l
i
n
u
x-nfs
.
org/~bfields
/
g
i
t
commit
|
commitdiff
|
tree
2007-08-26
Brian Hetro
Make usa
g
e documentation for git-add
c
onsistent
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-26
Brian Hetro
Make usage docum
e
n
t
a
t
ion for git
-
am c
o
nsis
t
ent
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-25
Sh
a
wn O
.
Pe
a
rc
e
D
o
n't segfault if we fail
e
d
t
o
i
nfla
t
e a
p
acked delta
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-25
Junio
C
Ha
m
a
n
o
p
a
ck-object
s
:
c
h
e
ck return value from read_sha1_
f
ile()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-25
Junio C Hamano
b
l
a
me:
che
c
k return value
f
rom
r
ead_s
h
a1_fil
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-25
Simon
H
ausmann
git-p4:
F
ix warnin
g
s about non-exista
n
t
ref
s
/remotes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-25
Simon Hausmann
git-p4:
M
a
k
e
'g
i
t-p4 branches' wor
k
after
a
n
in
i
tial
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-25
Brian Hetro
D
ocumentation: Correct vario
u
s m
i
sspelling
s
an
d
typos
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-25
Brian
H
etro
Docume
n
ta
t
ion:
F
or
c
ons
i
stency, use CVS instead of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-25
L
inus Torvalds
Fix
r
acy-git handling in git-w
r
i
te-tree
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-23
Joh
a
nne
s
S
c
h
indelin
r
ebase -i: fix squashi
n
g corner c
a
se
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-23
martin f
.
kraf
f
t
Insta
l
l man3 manpages t
o
$PREFIX/share/
m
an/man3 even
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-23
m
a
r
t
i
n
f
.
krafft
git-svn init/clone --std
l
a
yout opti
o
n to defa
u
l
t
-init
.
.
.
commit
|
commitdiff
|
tree
2007-08-23
David Kastrup
diff-del
t
a
.
c: Fix broken skip
c
a
lc
u
lation
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-23
J
uni
o
C Hamano
Merge bra
n
c
h
'm
a
s
t
er' of
git://repo
.
o
r
.
cz
/
git/fastimpo
r
t
commit
|
commitdiff
|
tree
2007-08-23
E
ric Wong
git-sv
n
:
dc
o
mmit prin
t
s
out
t
he
U
R
L to be co
m
mitted to
commit
|
commitdiff
|
tree
2007-08-22
Eric Wong
git-svn: update documenta
t
i
o
n
with
C
AVEATS
se
c
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-22
Sean Estabrooks
R
e
set
ter
m
inal
a
ttri
b
ut
e
s when termin
a
t
in
g
git send
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-22
Stefan Sperling
Docum
e
nt
-
u
option in g
i
t-svnimport man page
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-22
Quy To
n
that
Fix break
a
ge in
g
i
t-rev
-
list
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-22
Alexandre Julliard
git
.
el: Avoid a lisp erro
r
when there's no cur
r
ent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-22
Alex Riesen
Fix git-r
e
mote for A
c
t
i
ve
S
tate Perl
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-22
René Scharfe
Doc
u
m
e
n
tation: update tar
.
u
mask def
a
ul
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-22
S
h
awn O
.
Pear
c
e
Suggest uns
e
tti
n
g
c
ore
.
bar
e
when using new-work
d
i
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-22
S
hawn O
.
Pear
c
e
Fix
new-workdir (agai
n
) to work on bare repositories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-21
Junio C Ha
m
ano
GIT 1
.
5
.
3-rc6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-21
Junio
C
Hamano
M
erge branch 'master'
o
f git://git
.
kernel
.
org/pub/
s
cm
.
.
.
commit
|
commitdiff
|
tree
2007-08-21
A
lex R
i
e
sen
Avoid using
va_copy in fast-import: it
s
e
e
ms to
be
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-20
Juni
o
C Hamano
git clone: do no
t
issue warn
i
ng
while cloning locally
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-20
Dave Watson
F
ix misspelling of 'supp
r
ess' in docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-20
Steven Gri
m
m
Document wh
a
t
the stag
e
numb
e
rs in the :
$
n:path s
y
ntax
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-20
Shawn O
.
Pearce
Don't
allow combination of -g and -
-
reverse as it doesn
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-19
L
u
kas Sandstr
ö
m
Add the word reflog to Documenta
t
ion/config
.
t
xt
:
core
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-19
Matt
h
i
eu Moy
Add and docume
n
t a global -
-
no-pager o
p
ti
o
n
f
or git
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-19
Lin
u
s
T
orvalds
Take bi
n
ary
d
iffs
i
nto accoun
t
for
"
g
it rebase"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-19
Linus Torvalds
Make thin
-
pack generation su
b
pr
o
ject aware
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-19
Sh
a
wn
O
.
Pearce
Correct documentation of 're
f
log
s
how
'
to
explain it
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-19
J
un
i
o C Ham
a
no
Merge branch 'master' of git:/
/
rep
o
.
or
.
cz/git-
g
ui
commit
|
commitdiff
|
tree
2007-08-19
Jun
i
o C
Hamano
Mer
g
e b
r
anch 'master' of git://
g
it
.
kernel
.
org/pub/sc
m
.
.
.
commit
|
commitdiff
|
tree
2007-08-18
Joe
P
e
rches
git-
s
end-email --cc-cmd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-17
Mike Hommey
C
l
arify commi
t
-tr
e
e documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-17
Br
i
an Gernhardt
Minor clar
i
fications to git-filt
e
r-bran
c
h
usage and
d
oc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-17
Sean Estabrooks
Fix small typo in git send-email man
pa
g
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-17
L
a
r
s
Hjemli
git
-
submodule: re-enable
'status' as the d
e
fault
subcomma
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-17
Junio C
H
amano
Clean-
u
p read-tree error conditi
o
n
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-16
Brian Downi
n
g
C
l
arify
actual behavior of
'
g
it add' and
igno
r
e
d files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-16
Ar
j
en Laar
h
o
v
en
t1301-shared-rep
o
.
sh
:
fix 'stat' portabi
l
ity issue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-16
Junio
C Hamano
Documen
t
a
t
i
on
/
git-re
b
ase: fix an example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-16
J
u
n
i
o C Ham
a
no
g
it-clone:
a
llow --bare c
l
o
ne
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-16
Nic
o
l
as Pit
r
e
pack-objec
t
s:
rem
o
ve bog
u
s arguments to d
e
lta_cac
h
eable()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-16
S
v
en Verdoolaege
gi
t
-apply
:
apply
s
ubmodule
chan
g
es
With clean-ups from
Junio C Hamano
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-16
Junio C Hamano
U
p
date
document
a
tion
l
inks for ol
d
er releases
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-16
Junio C Hamano
Merge branch 'mai
n
t
'
to sync with
1
.
5
.
2
.
5
commit
|
commitdiff
|
tree
2007-08-16
Junio
C
Hamano
Fix read-
t
ree
m
erging more than 3 trees us
i
ng 3-way
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-15
Junio C Hama
n
o
G
I
T 1
.
5
.
2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-15
Salik
h
Zakirov
git-a
d
d -u p
a
ths
.
.
.
n
o
w work
s
f
r
om sub
d
i
rectory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-15
J
unio C Hamano
Fix "git
add -
u
"
data corruption
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next