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
Use extended SHA1 syntax in merge-recursive conflicts.
2006-12-23
Shawn O
.
Pearce
Use
e
xte
n
ded SHA1 synt
a
x in mer
g
e-recu
r
s
ive co
n
flicts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsimons
gitweb: A
l
low sear
c
h t
o
b
e
disabled f
r
om the con
f
ig
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
R
obert Fitzsi
m
ons
gitwe
b
: Re
q
ui
r
e
a m
i
nimum of
two characte
r
for
the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
R
o
bert Fitzsim
o
ns
gitweb: U
s
e rev-list p
a
tter
n
search opti
o
ns
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
N
i
colas Pitre
c
h
ec
k
out:
m
ake the message
a
bout the
need for a new
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
R
ob
e
rt Fitzsimons
git
w
eb: optimize g
i
t_summary
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Rober
t
F
it
z
simons
gitw
e
b: optimize git_shortlog_body
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsimons
gitweb: optimize git_get_last_activity
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fi
t
z
s
imons
gitweb: Add missin
g
s
how '
.
.
.
' lin
k
s change
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Brian Gernhardt
Make g
i
t-
s
how-bra
n
ch op
t
ions similar to g
i
t-
b
ranch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Brian G
e
r
nhardt
Keep "git --git-dir" from causing a b
u
s error
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Eric Wo
n
g
g
i
t-svn:
enable common fet
c
h/commit options for dc
o
mmit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Alexandre Julliard
vc-git: Ign
o
re errors
caused by a non
-
existent directory
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Eri
c
Wong
R
emove NO_ACCUR
A
T
E_DIFF op
t
ions from build system
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Junio
C
Hamano
g
i
t-tag: l
o
s
e
exit
a
ft
e
r
d
ie
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Ju
n
io C Hamano
Really fix head
e
r
s for _
_
FreeBS
D
__
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio C
Ha
m
ano
Do not support "partial
U
R
L
sh
o
rtha
n
d" anymo
r
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
default
p
u
ll: forget about "newbie prote
c
tion" for
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio
C Haman
o
m
erg
e
a
nd
r
ese
t
:
adjust for "reset --h
a
rd" me
s
sages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio
C
Hamano
c
ommit-tree: do not
o
ve
r
f
l
ow MAXPARENT
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pearce
Introduce
a
g
l
obal level warn() function
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pearce
Renam
e
i
map-send's
i
n
t
ernal info/warn functions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
_XOPEN_SOURC
E
problem also exists
o
n Fre
e
BSD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Juni
o
C H
a
mano
parse-remote: mar
k
all refs n
o
t for
merge only when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
J
u
nio C Hamano
Merge
branch '
m
aint'
commit
|
commitdiff
|
tree
2006-12-22
J
ohannes Schindelin
git
-
reset --hard: tell the user what the HEAD
w
a
s reset
t
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Johan
n
e
s
Schindelin
git-
t
ag: su
p
port -F <file>
o
pt
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Ju
n
io
C
Hamano
Revert "git-
p
ull
:
ref
u
se default merge without bra
n
c
h
.
.
.
commit
|
commitdiff
|
tree
2006-12-22
Shawn
O
.
Pe
a
r
ce
Suggest 'add' in am/revert/ch
e
rry-pick
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Joha
n
ne
s
Schind
e
lin
Use git-merge-
f
ile in
git-merge-one-file, too
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schindelin
diff --check: fix off by on
e
error
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-21
Quy Tonthat
D
o
c
umen
t
ation
/
git-b
r
anch: new -r to delete
remote-tracking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-21
T
e
rje Ste
n
Bjerkset
h
Fix system header pro
b
lems on Ma
c
OS X
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-21
Junio
C
H
a
m
a
n
o
Merge
branch 'ew/svn-pm'
commit
|
commitdiff
|
tree
2006-12-20
Junio C H
a
mano
diff documentation: mostly t
a
lk
a
bo
u
t <comm
i
t>
commit
|
commitdiff
|
tree
2006-12-20
Junio
C
Hama
n
o
M
e
rge branch 'jc
/
leftr
i
ght'
commit
|
commitdiff
|
tree
2006-12-20
Junio
C Hamano
M
e
r
g
e branch 'jc
/
blame'
commit
|
commitdiff
|
tree
2006-12-20
Jun
i
o C Hamano
Mer
g
e b
r
anc
h
'
jc
/
bra
n
c
h
-remov
e
-remote
'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
M
e
rge br
a
nch 'jc
/
clone'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
compat/
i
net_nto
p
: do not u
s
e u_int
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Jun
i
o
C
Hamano
s
p
urious
.
s
p
i
n
man
p
ages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Ju
n
i
o
C Hamano
git-add: e
r
ror out when given no argum
e
nts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Ha
m
ano
M
er
g
e bran
c
h
'maint
'
commit
|
commitdiff
|
tree
2006-12-20
Juni
o
C Hamano
GIT 1
.
4
.
4
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
N
i
c
o
las
Pitre
clarify
some error message
s
wrt un
k
n
o
wn obj
e
ct t
y
pes
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
simpl
i
fy inclusion of sy
s
tem header files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Nicolas Pit
r
e
index-
p
ack usage of mma
p
() is unacceptabl
y
slower
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Robe
r
t Fitz
s
i
m
ons
g
i
tweb: Show
'
.
.
.
' links in "
s
ummary" view
o
n
ly if
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Jun
i
o C Hama
n
o
config_rename_section:
fix FILE* lea
k
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Brian
G
e
rn
h
ardt
R
e
move COLLISION
_
CHECK from Mak
e
file
s
i
n
ce it's not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Ju
n
i
o C Hamano
fi
x
populate-filespec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Eric Wong
gi
t
-
c
v
sserver: fix breakage when c
a
lli
n
g git merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio
C Ha
m
a
n
o
Re
v
ert "M
a
ke left-right
a
utomatic
.
"
commit
|
commitdiff
|
tree
2006-12-19
Josef Weiden
d
o
rfe
r
M
ove
"
n
o merge candidate"
w
arning
into
g
it-pull
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
Use prepr
o
cessor constants for e
n
vironment v
a
riable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
D
o
n
o
t create $G
I
T_DIR
/
remotes/ directory anymo
r
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
Mer
g
e b
r
anch 'jc/test-
c
lone'
into jc/c
l
one
commit
|
commitdiff
|
tree
2006-12-19
Johannes
S
c
h
in
d
elin
Intro
d
uce
GIT_TEMPLATE_DIR
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Ju
n
io C Hamano
Revert "fi
x
testsuite: make sure they use t
e
mplates
.
.
.
commit
|
commitdiff
|
tree
2006-12-19
Junio C
H
amano
blame: -b (blame
.
bl
a
n
k
boundary) and --root
(b
l
am
e
.
showroot)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Quy T
o
nthat
git-
b
ranch -d:
d
o
n
ot s
t
op at the first
f
ailur
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Ha
m
a
no
Teach git-branch
to delete
t
ra
c
king bra
n
ches with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Juni
o
C Hamano
fix testsuite: make sure they use templ
a
t
es freshly
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
rerere: fix
b
reakage
o
f res
o
lving
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Ane
e
sh Kumar
K
.
V
Add config
e
xample with resp
e
c
t
to b
r
anch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Brian
G
ernhardt
Add documentation for show-branch
-
-
topics
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
N
i
colas
Pitre
make git a bit
less c
r
ypti
c
on fetch
er
r
ors
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
N
icola
s
P
i
tre
make patch_de
l
ta()
error cases
a bit more
verbose
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio C Hamano
racy-git: documentation updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o C Hamano
sho
w
-ref: fix
-
-e
x
clude-existing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Juni
o
C Hamano
parse-remote::e
x
pan
d
_refs_wildca
r
d()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Jeff K
i
ng
vi
m
syntax: follow recent changes to
c
o
mmit template
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio
C
Hamano
s
how-ref
:
fix --verify --hash=le
n
gth
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
s
how-
r
e
f: fix
-
-quiet
-
-ve
r
ify
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
un
i
o C Hamano
Merge bran
c
h '
j
c/blame-bound
a
ry'
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
Merge branch 'jc
/
reflog' (early par
t
)
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
Merge br
a
nch '
j
s/bra
n
c
h
-config'
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
Merge branc
h
'jn/web' (earl
y
part)
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
avoid accessi
n
g _all_ loose refs i
n
git-sho
w
-ref -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Juni
o
C Hamano
git-f
e
tch:
A
void
r
eadi
n
g pa
c
k
e
d refs ove
r
a
nd over
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Teac
h
s
ho
w
-branch h
o
w to s
h
ow ref-log
d
at
a
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Ju
n
io C Ham
a
no
Make lef
t
-righ
t
automatic
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C
H
amano
Teach all of log
f
amily --le
f
t-right output
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Juni
o
C Ha
m
ano
rev-list --l
e
ft-right
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Ju
n
io
C
H
amano
markup fix
i
n svn
i
mport
d
o
cument
a
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Quy Ton
t
hat
Documentat
i
on: ne
w
option -P
fo
r
git-s
v
nimport
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C
H
amano
Fix mis-mark-up i
n
git-mer
g
e-
f
ile
.
txt d
o
cu
m
entati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Shawn
O
.
Pearce
Default GIT_C
O
MMITTER
_
NAME to
l
ogin name in recieve
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Fi
x
check_file_directory_confli
c
t()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
git-add: remo
v
e c
o
n
flictin
g
entry
w
hen
a
dd
i
ng
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Ham
a
no
update-index:
m
ake D/F conflic
t
erro
r
a bit more
ver
b
ose
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Joha
n
nes Sch
i
ndelin
git-branch: re
n
ame confi
g
v
ar
s
b
ran
c
h
.
<branch>
.
*
, too
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
o
hannes Schi
n
de
l
in
a
dd
a
fu
n
ctio
n
to rename se
c
t
ions in
the config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C
H
a
mano
git-
c
lone: lose t
h
e tra
d
i
t
i
o
nal '
n
o-separate-
r
em
o
te
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
git-clo
n
e: los
e
the artificial "fi
r
st"
fe
t
ch ref
s
pec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
u
n
i
o
C Hamano
git-pull: refu
s
e default merge w
i
thout
b
ranch
.
*
.
merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Jun
i
o C Hamano
git-clon
e
: u
s
e wildcard sp
e
cif
i
cation
f
o
r track
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio
C Hamano
merg
e
: gi
v
e a bi
t
pre
t
tier
merge
m
essage to "merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Jakub Narebs
k
i
g
i
tweb: Add "next" link to commit view
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Ja
k
ub Nar
e
bski
gitweb: Add
title
attribute to ref marker with
full
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next