repo.or.cz
/
git
/
gitbuild.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
xdl_merge(): fix a segmentation fault when refining conflicts
2006-12-28
Joh
a
nnes Schindelin
x
d
l_merge(): fix a
s
egmentation fault when refining
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
E
ric
W
on
g
git-svn: sort
mu
l
ti-init o
u
tput
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Eric Wo
n
g
git-svn
:
verify
_
ref() should actually
-
-ver
i
fy
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Eric Wong
git-sv
n
: print ou
t
the SVN
lib
r
ary version in --ver
s
ion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Eric Wong
git-svn: remo
v
e
non-delt
a
fetch
c
ode paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Eric W
o
ng
t
9200-git
-
cvsexport
c
omm
i
t
.
sh:
quiet dow
n
commit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Eric Wo
n
g
test-lib: qui
e
t down init-db
output fo
r
tes
t
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Eric Wong
t
602
4
-
recursive-merg
e
: quiet
d
ow
n
this test
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Junio C Ham
a
no
Me
r
g
e
branch 'j
s
/shallow'
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pearce
Allow git-merge to selec
t
the default
strategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pearce
Ho
n
or pull
.
{twohead,octop
u
s
}
in git-merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Sha
w
n
O
.
Pearce
Ensur
e
`git
-
pull` fails
if `git
-
merge` fails
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Sha
w
n O
.
Pear
c
e
Use branch names in
'
g
it-rebase -m' conflic
t
h
u
nks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Shawn
O
.
Pearce
Honor GIT_REFLOG_
A
CTION in gi
t
-rebase
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Shawn
O
.
P
ea
r
c
e
Use G
I
T_R
E
FLOG_A
C
TION environ
m
ent variable instead
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
J
a
kub Nar
e
bski
gitweb
:
Precompile CGI
r
outines for m
o
d_perl
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
J
a
kub
Narebsk
i
g
i
tweb:
A
d
d
mod
_
perl ver
s
io
n
st
r
ing to "ge
n
e
ra
t
or"
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Junio C Hamano
Merge branch 'sp/gc'
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hamano
Set NO_M
M
A
P for Cygw
i
n by default
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
J
unio C Ha
m
an
o
Use 'repack -a
-
d -l' instead of 'repack -a -d'
in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Ro
b
ert
Fitzsimons
gitweb: Re-enable rev-li
s
t
--parents for parse_commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Quy Tonthat
g
i
t
-send-email: defa
u
lt
v
alue for "
F
r
om:" field
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
J
u
n
i
o
C Ha
m
a
no
Merge bra
n
ch 'master' into js/sh
a
llow
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Junio
C
H
amano
e
ver
y
day: replace a few 'prune' and '
r
epack' with 'g
c
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Sha
w
n O
.
Pea
r
ce
Create 'git gc' to perf
o
rm
common mai
n
t
e
nance opera
t
i
o
ns
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
J
uni
o
C
Ha
m
ano
git-
r
efl
o
g: gc
.
* configuratio
n
an
d
documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
J
u
ni
o
C Hamano
r
erere gc:
honor configuration and document it
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hamano
c
o
un
t
-objects -v: show n
u
mber o
f
packs as well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hamano
Merge branch 'jc/fsck-re
f
log'
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hamano
e
veryday: update for
v
1
.
5
.
0
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Eric
Wong
git-
s
v
n
:
dc
o
mmit should
d
iff against the cur
r
ent HEA
D
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Eric Wong
git-svn: quiet do
w
n te
s
ts and
f
i
x
some
u
nportable shell
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Andy Parkins
hooks/co
m
mit-ms
g
: a
d
d example to
a
dd Signe
d
-
off-by
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Nico
l
as Pitre
move git-bla
m
e to its
p
l
ace i
n
.
g
itignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Ni
c
o
las P
i
tre
Add git-reflog to
.
gi
t
ignor
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Junio C Hamano
Document
git
-
rese
t
<commit> --
<
paths
>
.
.
.
commit
|
commitdiff
|
tree
2006-12-26
J
unio C H
a
m
ano
D
o
cumen
t
-
-numstat in git-apply and
g
it-diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Junio C
H
amano
show-branch
-
-
r
eflog: ad
d
document
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Nicolas Pi
t
re
add
.
mailmap for git-
s
ho
r
tlog output wit
h
the git repos
i
tory
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
J
unio C Hamano
GIT v1
.
5
.
0 preview
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Jun
i
o C Hamano
Me
r
ge branch '
j
c
/bm'
commit
|
commitdiff
|
tree
2006-12-26
Junio
C Hamano
Me
r
ge
branch '
r
f/web'
commit
|
commitdiff
|
tree
2006-12-26
Junio C
H
ama
n
o
git-add -f: all
o
w
adding otherwise
ignor
e
d
fil
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fitzsi
m
ons
gitwe
b
:
Use re
v
-l
i
st --sk
i
p
option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Robert F
i
tzsimons
gitweb: Ch
a
n
g
e his
t
ory action
t
o
use parse_commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Ro
b
ert Fi
t
zsimons
gitweb:
C
h
ange atom, rss actions
t
o
use parse_commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fitz
s
imons
gitwe
b
: Change header
search action
t
o
use parse_co
m
m
it
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Robe
r
t
Fitzsimons
g
itweb: Change
l
o
g action to use
pars
e
_commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fitz
s
imons
gitweb:
C
hange s
u
mma
r
y
,
shortlog acti
o
ns t
o
use
p
arse_commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
R
obert Fit
z
simons
git
w
e
b: We do
longer need the -
-
parents flag in rev
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
R
o
bert Fitzsimons
gitweb: Add pa
r
se_commits,
u
sed to bul
k
load commit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Junio
C
Haman
o
git-add: warn when adding an ignored
file wit
h
a
n
explici
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Jun
i
o
C Ha
m
a
no
git-
a
dd: ad
d
ignored fi
l
e
s
w
h
en asked
e
x
p
licitly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Junio C
Hama
n
o
read_directory: show_both opti
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Ha
m
ano
g
i
t-rm: Documentat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hamano
t3600: updat
e
the te
s
t
f
or update
d
git
rm
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Ham
a
no
git-rm: update to sa
n
er semantics
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Junio
C
Haman
o
match
_
path
s
pec() -- retur
n
h
o
w
well the spec matched
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hamano
Merge branch 'jc/skip
-
co
u
nt'
commit
|
commitdiff
|
tree
2006-12-25
Junio C Ham
a
no
M
e
rge branch 'jc/git-add--in
t
eractive'
commit
|
commitdiff
|
tree
2006-12-25
J
u
nio
C H
a
m
ano
g
it-add --int
e
ractive: a
d
d do
c
umen
t
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-24
Junio C Hamano
A
l
l
ow branch
.
*
.
mer
g
e to ta
l
k
about remot
e
tracking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-24
Ju
n
i
o
C
H
am
a
n
o
M
erge branch 's
b
/merge-friendly'
commit
|
commitdiff
|
tree
2006-12-24
J
u
n
io C H
a
m
a
no
Me
r
ge branch 'js/
r
erere'
commit
|
commitdiff
|
tree
2006-12-24
Johannes Schindeli
n
com
m
it-tree
:
en
c
ourage UTF-8 commit message
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-24
S
h
awn O
.
Pearc
e
S
w
itch git_mm
a
p to use pread
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-24
Shawn
O
.
Pearce
R
e
na
m
e
g
itfakemmap to
g
it_mmap
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitz
s
imons
git
w
eb: Paginate commit/author/committ
e
r se
a
rch
output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
E
r
ic Wong
Makefile:
a
dd quick-i
n
stall-doc fo
r
installi
n
g pre
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Sh
a
wn O
.
Pea
r
ce
Display 'theirs'
b
ranch name when pos
s
ible in merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Shawn O
.
Pear
c
e
Use extended
SH
A
1 synt
a
x in mer
g
e-r
e
cu
r
s
i
ve confli
c
ts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Ju
n
i
o C
Hamano
reflog
e
xpire: do not punt on tag
s
that point at non
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert
F
i
tzsimons
gitw
e
b
:
Allow
s
earch to be disabl
e
d from the
c
on
f
ig
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert
Fitzs
i
mons
git
w
e
b
:
Require
a m
i
nimum of two charact
e
r f
o
r the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert
F
itzsimons
gi
t
web: U
s
e
rev-list
p
a
ttern
searc
h
options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Nic
o
las
Pitre
chec
k
out: make
t
he message abo
u
t th
e
need for a ne
w
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsimons
gitweb: optimize git_summary
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Rob
e
rt F
i
tzsimons
git
w
e
b
: optimize git_shortlog_body
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert
Fi
t
zsimons
gitweb: op
t
imize git_get_last_activity
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
R
o
bert Fitzsimons
gitweb: Add missing sho
w
'
.
.
.
' links ch
a
nge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Bria
n
G
e
r
nhardt
M
a
ke gi
t
-s
h
ow-branch opti
o
ns sim
i
lar to git-b
r
anch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Br
i
an Gernhardt
Keep "git --git-dir" fr
o
m causing a bus er
r
or
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Eric Wong
g
i
t
-svn:
enable common fetch/comm
i
t options for dcommit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Alexandre
J
u
l
liard
vc-git
:
I
g
n
o
r
e
error
s
caused
b
y a no
n
-
existent directory
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Eric Wong
Re
m
ove NO_ACCURATE_DI
F
F option
s
from
b
uild
s
ystems
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
J
unio C Hamano
git-tag: l
o
se exi
t
after die
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Jun
i
o C Hama
n
o
Really fix
h
eade
r
s for __FreeBSD__
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hama
n
o
Do
n
ot s
u
pport "partial URL
s
hor
t
h
and" anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
default pull: forget
a
bout "newbie pr
o
tection
"
for
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Haman
o
merge and res
e
t: adjust for
"
reset
-
-hard" messages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Jun
i
o C Hamano
ref
l
og
expire: pr
u
ne commi
t
s that are not incomplete
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio C
H
am
a
no
c
ommit-tree: do not overflow MAX
P
ARENT
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schindelin
Make git-rerere a builtin
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
J
ohannes Sch
i
ndelin
Add a test for gi
t
-re
r
ere
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Joha
n
n
e
s
S
chindelin
move read_mmfile(
)
into xdiff-inter
f
ace
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pe
a
rce
Don't crash durin
g
repack of a refl
o
g wit
h
pruned commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
J
u
n
io C Hamano
Merge branch
'
maste
r
' into jc/fsck
-
ref
l
og
commit
|
commitdiff
|
tree
2006-12-22
Sh
a
wn O
.
Pearce
Introduce
a glob
a
l level warn() function
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
S
h
a
wn
O
.
Pearce
Rename im
a
p-
s
end's int
e
rnal info/warn functions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio
C
H
amano
_XOPEN_S
O
URC
E
problem
a
lso exists
on Fre
e
BSD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next