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
Use merge-recursive in git-am -3.
2006-12-29
Shawn
O
.
Pearce
Use merge-recursive in git-
a
m -3
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
P
e
arce
A
llow merging ba
r
e tr
e
es in merge-recursi
v
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
P
earce
M
o
ve better_branch_nam
e
abo
v
e
get_r
e
f in
merg
e
-recursive
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-29
Junio C Hama
n
o
Merge bra
n
ch 'jc/utf
8
'
commit
|
commitdiff
|
tree
2006-12-29
Junio
C Hamano
Allow non-fast
-
for
w
ard of remote tracking branches
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-29
Junio C H
a
mano
cor
e
.
logallrefu
p
dates: log remotes
/
t
r
acking branches
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-29
Junio C
H
amano
GIT_SKIP_TESTS: allow users to
o
m
it te
s
ts that are
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-29
Junio C Hamano
t3900: test conversion to no
n
UTF-
8
as w
e
ll
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-29
Junio
C Hamano
Merge branch '
j
c/mak
e
'
commit
|
commitdiff
|
tree
2006-12-28
J
im Me
y
e
r
ing
update hook: redir
e
ct
_
both_
d
iagno
s
tic line
s
to stder
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Johannes Schindel
i
n
xdl_merge():
fix a segmenta
t
io
n
fa
u
lt when r
e
fining
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
E
r
ic Wo
n
g
g
i
t-svn: s
o
rt multi-
i
n
i
t out
p
ut
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
E
ric Wo
n
g
g
i
t-svn: verify_r
e
f() s
h
ould actua
l
ly
-
-verify
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
E
ric
W
ong
git-svn:
print out the SVN libr
a
ry ver
s
i
on
in -
-
version
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Eric
Won
g
git-s
v
n: rem
o
ve no
n
-d
e
lta
f
etch code
pat
h
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Er
i
c Wong
t92
0
0-git-cvsexportcommit
.
sh: quiet do
w
n comm
i
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Eric Wong
t
est-lib: quiet down in
i
t-db out
p
ut f
o
r test
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Er
i
c
W
o
ng
t6024-rec
u
r
s
i
ve-merge: q
u
i
et down this test
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
J
u
ni
o
C Ha
m
ano
Mer
g
e
b
ranch 'js/shallow'
commit
|
commitdiff
|
tree
2006-12-28
Shawn
O
.
Pearce
Allow g
i
t-mer
g
e to sel
e
c
t the def
a
ult st
r
ategy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
P
e
arce
Hono
r
pull
.
{two
h
ead,
o
ctopus}
i
n
g
it-
m
erge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Sha
w
n O
.
Pearce
Ensure `git-pull` fails
if `
g
it-mer
g
e`
fai
l
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Shawn
O
.
Pearc
e
Use branch names in
'
g
it-rebase -m'
c
onflic
t
hunks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pearce
Hon
o
r
GIT_REFLO
G
_ACTION in git-rebase
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Sh
a
wn
O
.
Pe
a
rce
Use G
I
T_RE
F
LOG_ACTION env
i
ronment
variable
instead
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Jakub Nare
b
s
k
i
gitweb:
P
recompi
l
e
CGI routines for m
o
d
_
p
erl
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
J
akub Na
r
ebski
gitweb: Add mod_p
e
rl
v
ersion string to "generator"
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Junio C Hama
n
o
Re
n
a
me t3900 te
s
t vector file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Junio
C Hamano
gcc does not necessarily pass runt
i
me
libpath with -R
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Ju
n
io C Hamano
Merge branch 'sp/gc'
commit
|
commitdiff
|
tree
2006-12-28
Juni
o
C Hamano
UTF-8: introduce i18n
.
log
o
utp
u
ten
c
od
i
ng
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Junio
C
Hamano
Set NO_MMAP
fo
r
Cygwin by
default
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
J
u
nio C Hamano
Use 're
p
ack -a -d -l' instead of
'repack -a -d' in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Robert
F
it
z
simon
s
gitweb:
R
e-enab
l
e rev-list --paren
t
s for parse_commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Quy Tonthat
git-s
e
n
d-email: d
e
fault v
a
lu
e
fo
r
"From:" fie
l
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Junio C
H
amano
Merg
e
bra
n
ch
'
mast
e
r
' into js/shallow
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Junio
C
Hama
n
o
everyday:
re
p
l
a
ce a fe
w
'
pr
u
ne'
a
nd
'repack' with 'gc'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
S
h
awn O
.
Pe
a
rce
Create 'git
g
c
'
t
o
perform com
m
on mai
n
tenance
o
p
eration
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hama
n
o
git-reflog: gc
.
* configuration an
d
docume
n
tation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Juni
o
C Ha
m
a
n
o
rerere gc: h
o
nor configu
r
a
tion and document i
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
J
u
ni
o
C Ham
a
no
c
ount-objec
t
s -v: show
n
um
b
er o
f
packs as
w
ell
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hamano
M
e
rge branch 'jc/fsck-r
e
flog
'
commit
|
commitdiff
|
tree
2006-12-27
Junio C
H
amano
e
v
e
ryday: update fo
r
v1
.
5
.
0
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Eric Wong
git-svn: dcommit
s
hould diff a
g
ainst t
h
e current HEA
D
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Eric
W
ong
git
-
svn:
q
uiet down tests and fix s
o
m
e
unport
a
ble
s
hell
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Andy Par
k
i
ns
hooks/commit-msg: add exa
m
ple to add S
i
gned-off-by
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Nicol
a
s
Pitr
e
m
ove git
-
blame to its place in
.
g
i
tignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Nic
o
las Pitre
Add git
-
re
f
l
og to
.
gi
t
igno
r
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
J
u
nio
C
Ha
m
a
n
o
Teach log fa
m
i
l
y --encoding
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Junio C Hama
n
o
i1
8
n
.
logToUTF8: conv
e
rt
c
ommit log me
s
sage
t
o U
T
F-8
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Ju
n
io
C
H
a
mano
M
o
ve enc
o
ding conver
s
ion
r
out
i
ne out of
ma
i
linfo to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Junio C H
a
mano
Document git-reset
<
co
m
mit> --
<
pat
h
s>
.
.
.
commit
|
commitdiff
|
tree
2006-12-26
J
uni
o
C H
a
mano
Document
-
-
nums
t
at in
g
it-apply
and g
i
t-diff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Juni
o
C
Hamano
show-
b
ranch --reflog
:
add documentati
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Nicolas
Pitre
a
dd
.
mailmap for git-shortlog output
wi
t
h the git
repo
s
itory
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Junio C
Haman
o
G
I
T v1
.
5
.
0 pre
v
iew
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Junio
C
Hamano
M
e
r
g
e branch 'jc/b
m
'
commit
|
commitdiff
|
tree
2006-12-26
Junio C Hamano
Merge
branch 'rf/
w
eb'
commit
|
commitdiff
|
tree
2006-12-26
J
unio C Hamano
git-add -f: a
l
low adding othe
r
wise ig
n
ored files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
R
ob
e
rt Fitzsimons
g
i
t
w
e
b: Use
rev-list --skip option
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fitzsim
o
ns
gi
t
web: Chan
g
e hi
s
t
o
ry ac
t
io
n
to u
s
e parse_co
m
mits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Ro
b
ert F
i
tzsimons
gitweb: Chan
g
e atom, rss ac
t
ions
to use
pars
e
_commits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
R
o
b
e
rt
F
itzsimon
s
gitweb: Change h
e
ad
e
r
searc
h
act
i
on to use parse_commits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fit
z
simons
gitweb:
C
hange log
action to u
s
e
p
arse_commits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robe
r
t Fitzsimons
g
it
w
eb: Change sum
m
ary, shortlog
a
c
tions to use parse
_
co
m
mits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fi
t
zs
i
m
ons
gitw
e
b:
W
e
d
o longer need the
-
-parents
flag
i
n rev
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Rober
t
F
i
tzsimons
gitweb:
Add
p
arse_commits, used to bulk load commit
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Juni
o
C Hamano
git-add: war
n
when adding an ign
o
red f
i
l
e
wi
t
h a
n
explicit
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Jun
i
o
C
H
amano
git-
a
d
d
:
add ign
o
red files when
a
sk
e
d
e
xplic
i
tly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio
C
Ha
m
ano
read_di
r
ectory:
s
h
o
w_both
o
ption
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Haman
o
git-r
m
: Documentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
J
u
nio C
H
amano
t3600: update the
test for upd
a
te
d
git rm
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Ju
n
io C H
a
mano
g
it-rm: up
d
at
e
to saner se
m
antics
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio C
H
a
mano
match
_
pathspec() -- re
t
ur
n
how well the spec matched
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hama
n
o
Merge branch '
j
c
/
skip
-
co
u
nt'
commit
|
commitdiff
|
tree
2006-12-25
Jun
i
o C Hamano
Mer
g
e branch 'jc/git-add--interacti
v
e'
commit
|
commitdiff
|
tree
2006-12-25
J
unio
C
H
a
mano
git-add --i
n
teracti
v
e
:
a
dd
d
ocument
a
tion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-24
J
unio C Hamano
A
l
low branch
.
*
.
merge to
talk a
b
out remote tracking
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-24
Junio C Hamano
M
e
rge branc
h
'sb/merge-frie
n
dly'
commit
|
commitdiff
|
tree
2006-12-24
J
unio C
H
aman
o
Merge b
r
anch
'js/rerere'
commit
|
commitdiff
|
tree
2006-12-24
Johannes Schi
n
delin
c
ommit-tree: encourage
UTF-
8
c
o
m
m
i
t
messages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-24
S
h
awn O
.
Pearce
Sw
i
tch
g
it_mmap t
o
use pread
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-24
Shaw
n
O
.
Pearce
R
e
name gitfa
k
emmap to
git_
m
map
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fi
t
zsimons
g
i
twe
b
:
P
a
gi
n
a
t
e commit/author/committer search output
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Eric Wo
n
g
Makefile:
add quick-instal
l
-doc
f
or
i
n
s
tal
l
ing pre
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Shawn O
.
Pearce
Dis
p
lay 'theirs' branch
name
w
hen po
s
sible i
n
m
erge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Shawn O
.
P
e
arce
Use
e
xtende
d
SHA1 syntax i
n
m
erge-recursive con
f
licts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Junio C Hama
n
o
reflog expire: do not p
u
nt on tags that point at non
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsimons
gitweb: Allow sea
r
ch to be disab
l
ed
from the config
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitz
s
imons
g
i
twe
b
: Require a minimum of two
c
haracter for the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
R
o
be
r
t Fi
t
zsimo
n
s
gitw
e
b:
Use rev
-
l
i
st pattern sear
c
h
options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
N
i
co
l
as Pit
r
e
checko
u
t: m
a
k
e
the message
a
bout the nee
d
for a new
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robe
r
t Fi
t
zsimons
gitweb: optimize git
_
s
umma
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
R
o
b
er
t
F
i
t
z
simo
n
s
gitw
e
b:
optimize git_sh
o
rtlog_bo
d
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
R
o
b
e
rt Fitzsimon
s
gitweb: optimize gi
t
_get_
l
ast_activity
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
R
o
bert Fitzsimon
s
gitweb: A
d
d
m
iss
i
n
g
s
h
o
w '
.
.
.
'
l
i
n
ks change
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Brian Gern
h
a
r
dt
Make git-s
h
ow-br
a
nch opt
i
ons s
i
m
ilar to git-branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Br
i
an Gernhar
d
t
Ke
e
p "
g
i
t -
-
git-dir" fr
o
m causing a bus
error
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
E
r
ic Wo
n
g
git-svn
:
enable common fet
c
h/commit opti
o
n
s
for dcommit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Alexan
d
re
J
ulliard
v
c
-g
i
t: Ign
o
re erro
r
s
cau
s
ed by a
non-exi
s
t
ent d
i
r
ectory
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next