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
Merge branch 'maint'
2006-12-22
Jun
i
o C Ha
m
ano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-22
Johannes Sch
i
ndelin
gi
t
-reset --hard: tell the user
w
h
at
the
HE
A
D was reset to
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schin
d
elin
git-tag: support -F <file> opt
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
J
unio C Hamano
Re
v
ert
"
git-
p
ull:
refu
s
e default m
e
r
g
e
w
ithout branch
.
.
.
commit
|
commitdiff
|
tree
2006-12-22
Sh
a
wn O
.
Pearce
Suggest
'add'
in am
/
revert/c
h
erry-pick
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
J
o
h
annes
Schindelin
Use git-merge-file i
n
git-merge-
o
n
e
-
file, too
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Johanne
s
Schindelin
d
iff --check: fix off by on
e
e
r
ror
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-21
Qu
y
Tonthat
Doc
u
mentation/g
i
t-branch: new -r
to d
e
lete remote-track
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-21
Terje Sten Bjerkset
h
F
ix system header problems o
n
Mac
OS X
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-21
J
unio
C Hamano
Merge b
r
anch 'ew/svn-pm'
commit
|
commitdiff
|
tree
2006-12-20
Junio
C
H
amano
diff documen
t
ation: mostly talk about
<commit>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Haman
o
M
erge branch 'jc/lef
t
right'
commit
|
commitdiff
|
tree
2006-12-20
Junio C H
a
m
a
no
Merge branch 'jc
/
blam
e
'
commit
|
commitdiff
|
tree
2006-12-20
Junio C
H
a
mano
Merge
b
r
anch 'jc/branc
h
-remove-re
m
o
t
e'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
Merg
e
bran
c
h
'j
c
/clone'
commit
|
commitdiff
|
tree
2006-12-20
J
u
nio C Hamano
compat/inet_ntop: do not u
s
e u_int
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
spuri
o
us
.
sp i
n
m
a
npages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Ju
n
io
C Hamano
git-add: error
o
u
t when
gi
v
en no arguments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio
C
Hama
n
o
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
GIT 1
.
4
.
4
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Nicol
a
s Pit
r
e
clarify some
e
rror me
s
sages wrt unknown o
b
jec
t
types
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio
C
Ham
a
n
o
simplify incl
u
sio
n
o
f system head
e
r files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
N
i
c
o
l
as Pitre
index
-
pack usage of
m
map
(
) is un
a
cceptably slower on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Robert Fitzsimons
g
itweb: Sho
w
'
.
.
.
' links in "
s
ummary
"
view on
l
y if
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hama
n
o
con
f
i
g
_r
e
name_sec
t
ion: fix FILE* l
e
ak
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Br
i
an G
e
r
n
hard
t
Rem
o
ve COLLISION_
C
H
ECK from Makefil
e
since it's not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
f
i
x populate-file
s
pec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Er
i
c Wong
git-cvsserver: fix break
a
ge when calling git
merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C
H
aman
o
Revert
"Make left-right auto
m
atic
.
"
commit
|
commitdiff
|
tree
2006-12-19
Josef
W
ei
d
endorfe
r
Mov
e
"no
merge cand
i
d
a
t
e
"
warn
i
n
g
i
n
to git-pull
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C
Hamano
Use
p
reprocessor constan
t
s for
environment variable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C
H
a
m
a
no
Do not create $GIT_DIR/remote
s
/ directory anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
Merge branch '
j
c/test-c
l
one' into jc/clone
commit
|
commitdiff
|
tree
2006-12-19
Johanne
s
Schindelin
Int
r
oduce GIT_TEM
P
LATE_DIR
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
Revert "fix t
e
stsuit
e
: make sur
e
they use tem
p
la
t
es
.
.
.
commit
|
commitdiff
|
tree
2006-12-19
Ju
n
io
C
Hamano
blam
e
: -b (b
l
ame
.
blankbou
n
dar
y
) and --
r
o
o
t
(
b
l
a
m
e
.
showroot)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Q
u
y Tonthat
g
it-br
a
nch -d: do n
o
t stop at the first failure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
Teach
g
it-bra
n
c
h
t
o
delete tracking bra
n
c
h
es
w
ith
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
J
u
nio C Ha
m
ano
f
ix testsuite:
ma
k
e sur
e
they use te
m
plates fre
s
hly
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Juni
o
C
Hamano
re
r
ere: fi
x
breakage
of resolvin
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
A
n
eesh
K
um
a
r K
.
V
Add config
e
xample with r
e
spec
t
to br
a
nch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
B
r
ian Gern
h
ardt
Add
d
ocu
m
entation for
show-bra
n
ch --topics
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
N
i
co
l
as Pitre
make git a b
i
t less cryptic on
fetch erro
r
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Nicola
s
Pitre
mak
e
pa
t
ch_de
l
ta() error cases a bi
t
more verb
o
se
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
racy-git: documentation
update
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio C Ham
a
no
s
how-ref: f
i
x
--exclude-
e
xisting
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o C Hamano
parse-rem
o
te:
:
expa
n
d_re
f
s
_
wildcard()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
eff King
vim sy
n
t
ax: follow
r
e
cent changes
to
c
ommit te
m
plate
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
show-ref: fix --v
e
r
ify --hash=length
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
u
n
io C Hamano
show-ref:
f
i
x
--qu
i
et --verify
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Ha
m
ano
Mer
g
e branch 'jc/
b
lame-boundar
y
'
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
Merge b
r
anch 'jc/reflog' (early
p
a
r
t)
commit
|
commitdiff
|
tree
2006-12-18
Junio C Ha
m
ano
Merge branc
h
'j
s
/branch-config'
commit
|
commitdiff
|
tree
2006-12-18
J
unio
C
Ham
a
no
Merge
b
r
a
nch '
j
n/we
b
'
(
e
arly
p
art)
commit
|
commitdiff
|
tree
2006-12-18
Ju
n
i
o
C Hamano
avoi
d
accessing _all_
loose refs i
n
git-s
h
o
w
-
r
e
f -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
unio C Haman
o
git-fetch: Avo
i
d r
e
ading
pac
k
ed refs over
and over
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Ju
n
io C H
a
mano
Te
a
ch show-branch how to show ref-
l
og data
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Ju
n
io C Hamano
Make
l
eft-
r
i
ght a
u
t
o
matic
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
u
n
io C Hamano
Teach all of log fam
i
ly --
l
eft-right output
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Juni
o
C Hamano
r
e
v-list --left-right
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio
C
Hamano
mark
u
p fix in svnimp
o
rt docu
m
entation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Quy To
n
t
h
a
t
Documentation: new op
t
ion -P for git-
s
vn
i
mport
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Jun
i
o
C
Hamano
F
i
x
mis-mark-u
p
in g
i
t
-
mer
g
e-file
.
tx
t
d
o
cumen
t
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Sh
a
wn
O
.
Pearce
Defau
l
t GIT_COMMITTER_NAME to
login
n
ame in recieve
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Fix check_file_dir
e
ctory_conflic
t
()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C
Ha
m
ano
git-add:
r
emove con
f
l
ict
i
ng entry when ad
d
ing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio
C
Hamano
update-index: mak
e
D
/F conflict error
a bit more ver
b
o
se
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Johannes Sch
i
ndelin
gi
t
-branch: rename con
f
i
g vars b
r
anch
.
<branch>
.
*, too
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Johannes Schindelin
add a f
u
nction to rename
sec
t
ions in t
h
e config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Ham
a
no
git-clone:
l
ose the traditi
o
nal 'no-separate-remote
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C
H
amano
git-clone:
lose
t
he art
i
ficial "fi
r
st" f
e
tch r
e
fspe
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C
Hamano
git-pull: refuse default
merge without branch
.
*
.
m
e
rg
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
g
it-clone: use wildc
a
rd sp
e
cif
i
cati
o
n for tracking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
merge: give
a
bit prettier
m
erge me
s
sage to "mer
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Jak
u
b Narebski
gitweb: Add "ne
x
t
"
l
i
nk to commit vi
e
w
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Jakub Narebski
g
i
tweb: Add t
i
tle
attribute
t
o
r
ef marker with full
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Jakub Narebski
g
i
tweb: Do not s
h
o
w
difftree for merges in "co
m
mit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Eric Won
g
git-
s
vn: rename 'com
m
i
t
'
c
ommand
t
o
'
s
e
t-tree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Eric W
o
n
g
git-svn:
remo
v
e support for the
s
vn command
-
li
n
e client
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
o
h
ann
e
s
Schindelin
Docu
m
ent git-
m
e
r
ge-file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Quy To
n
t
h
at
git-
c
lone d
o
c
umentat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Andy Parkins
git-st
a
tus alwa
y
s
says what branch it
'
s
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Eric Wong
git
-
svn
:
convert to usi
n
g Gi
t
.
pm
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shawn
O
.
Pearce
Ali
g
n sec
t
ion headers of '
g
it s
t
atus' to new 'git
a
dd'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pearce
Suggest
u
se of "git add file1
f
i
le2" when th
e
re is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
B
r
ian Gernhardt
Mak
e
git-diff
d
ocument
a
tio
n
use [-
-
] whe
n
it s
h
ould
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Brian Gernhardt
A
d
d --add
optio
n
to gi
t
-repo
-
config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shawn
O
.
Pearce
Teach
b
ash the new features of 'git s
h
ow'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
L
u
b
e
n T
u
ikov
Exp
o
rt PE
R
L_PATH
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Sh
a
wn O
.
Pearce
Enable reflog
s
by default in any repository with a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shaw
n
O
.
Pearce
Provide mor
e
m
e
aningful o
u
t
p
ut from 'gi
t
init-db'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Nicolas Pitre
make com
m
it
m
e
s
sage a
l
i
ttle
m
ore c
o
nsistent a
n
d
conf
o
rting
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pearce
Avoid accessing a s
l
o
w
work
i
ng copy duri
n
g
diff
c
ore
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio
C Ham
a
n
o
Merge
branch 'js/show
'
commit
|
commitdiff
|
tree
2006-12-14
J
ohannes Schind
e
lin
git-show: g
r
o
k
b
lobs,
trees and
tags, too
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Jun
i
o C Hamano
git-reset [--mixed] <tree> [--] <pa
t
hs>
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Jun
i
o
C
Hamano
g
i
t-reset: make it work
f
rom wi
t
hin a subd
i
re
c
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Juni
o
C H
a
m
ano
git
-
fetch: make it
work from w
i
thin a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
o
hannes Schindelin
INSTALL: no n
e
ed to have GNU diff inst
a
lled
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
unio
C
Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
next