repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Allow git-merge to select the default strategy.
2006-12-28
Shawn
O
.
Pearce
Allow gi
t
-m
e
rg
e
to select
the default strategy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pearce
Ho
n
o
r
p
ull
.
{twohead,
o
ctopus} in git-me
r
ge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pe
a
rce
Ensure `git-pull` fails if `gi
t
-merge` fails
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
S
hawn O
.
Pearce
Use b
r
anch nam
e
s
i
n '
g
it-rebase
-m' c
o
nflic
t
hunks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
P
e
arce
Honor GIT_REFL
O
G_ACTION i
n
git-re
b
a
s
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pearce
Use GIT_REFL
O
G_ACTION en
v
ironment variabl
e
in
s
te
a
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Jakub Narebski
gitweb: Precomp
i
le CGI routines for mod_perl
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Jaku
b
Narebski
git
w
e
b
: Add mod_perl version str
i
ng to "generat
o
r"
.
.
.
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
Se
t
N
O_MMAP for C
y
gwin by
d
e
f
ault
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Jun
i
o C Ham
a
no
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 Fitzsim
o
n
s
gi
t
web
:
Re
-
enable r
e
v-list --par
e
n
t
s
f
or
p
arse_commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Quy To
n
th
a
t
git
-
send-email:
d
e
fault value for "From
:
" field
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Ju
n
io C Hamano
everyday:
replace a
few 'prun
e
' and 'repack
'
with 'gc
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
S
h
a
wn
O
.
Pearce
Create 'git gc' to per
f
o
rm common maintenance operations
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hamano
git-reflog
:
gc
.
* configu
r
ati
o
n
a
nd docum
e
ntation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Jun
i
o
C
H
a
mano
r
erere gc: h
o
nor configuration and d
o
cument it
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hamano
count-objects -v: show n
u
mber of
p
acks as well
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
J
u
ni
o
C
Hamano
M
erge bran
c
h 'jc/f
s
ck-reflog'
commit
|
commitdiff
|
tree
2006-12-27
J
u
n
io C Hamano
ev
e
ryday:
u
pda
t
e for v1
.
5
.
0
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Eric
W
ong
git-svn: dc
o
mmit sho
u
ld di
f
f
a
gains
t
t
h
e curren
t
H
E
A
D
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Eric Wong
g
i
t
-s
v
n: quiet
down tests and
f
ix
s
ome
u
nportab
l
e
she
l
l
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Andy
P
ark
i
ns
hook
s
/commi
t
-
m
sg:
a
dd exa
m
p
le to add Sign
e
d
-
off-by
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Nicolas Pitre
move gi
t
-blame to it
s
pl
a
ce
in
.
giti
g
nore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Nic
o
la
s
Pitre
Add gi
t
-refl
o
g to
.
g
i
t
i
gnore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
J
u
ni
o
C Hamano
Docum
e
nt git-reset <commit> -- <paths>
.
.
.
commit
|
commitdiff
|
tree
2006-12-26
Junio C H
a
m
a
n
o
Document --num
s
tat in git-ap
p
ly and g
i
t-diff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
J
u
nio C Hamano
s
h
ow-branch --reflog: add documen
t
ati
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Nicolas
P
itre
ad
d
.
m
a
ilmap for
g
it-sho
r
t
l
og o
u
tput
with the git repository
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Junio C
Haman
o
GIT v1
.
5
.
0
p
r
e
view
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
J
unio C Hamano
Merge branch 'jc/bm
'
commit
|
commitdiff
|
tree
2006-12-26
Junio C H
a
mano
Merge branch '
r
f/web'
commit
|
commitdiff
|
tree
2006-12-26
Junio C Hamano
g
i
t
-
ad
d
-f: allow adding otherwise ignored files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fitzsimons
gitweb: Use rev-l
i
st --
s
kip
o
ption
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Rob
e
rt
F
i
t
zsimo
n
s
gitweb: Change hi
s
tory actio
n
to use parse_commit
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fitz
s
imons
gitw
e
b:
C
han
g
e
atom,
rss
a
ctions to use parse
_
c
o
mmits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robe
r
t Fitzsimo
n
s
g
i
tweb: C
h
a
n
ge hea
d
er se
a
rch a
c
ti
o
n to use parse_
c
o
mmits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
R
obert Fitzsimo
n
s
gi
t
w
e
b
:
Chan
g
e l
o
g action to use par
s
e_commits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
R
obert Fit
z
simons
g
i
tweb:
Change
summa
r
y
,
shor
t
log actio
n
s
t
o use parse_commits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fi
t
z
s
i
mons
gitw
e
b: We d
o
longer
need t
h
e
--p
a
rents flag in r
e
v
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
R
obert Fitzsimo
n
s
gi
t
w
e
b: Add parse_co
m
mits, us
e
d to bulk l
o
ad comm
i
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hamano
gi
t
-ad
d
:
w
ar
n
w
h
e
n
adding
a
n
ignored file
w
ith an
e
xplicit
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Juni
o
C Hamano
git-ad
d
:
ad
d
i
g
nored files when a
s
ked
e
xpl
i
citly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Juni
o
C Haman
o
read_dir
e
ctory:
s
how_b
o
t
h
op
t
ion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio
C
Hamano
g
i
t-
r
m: Doc
u
m
e
ntation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hamano
t3600: up
d
ate the
test for upd
a
ted git
r
m
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hama
n
o
git-rm: update to san
e
r s
e
mantics
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Ju
n
io
C
Ha
m
ano
match_pathspec() -- r
e
turn h
o
w well the spec
matched
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
J
u
nio C
H
amano
M
erge b
r
anch 'jc/s
k
ip
-
coun
t
'
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hamano
M
erge bran
c
h 'jc/git-add
-
-intera
c
t
ive'
commit
|
commitdiff
|
tree
2006-12-25
J
u
nio C Hamano
git-add --interactive: add d
o
cument
a
tion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-24
J
unio C
H
amano
Allow branch
.
*
.
mer
g
e
to ta
l
k about remo
t
e t
r
acking
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-24
Junio C Hamano
M
erge
branch 'sb/merge-friendly'
commit
|
commitdiff
|
tree
2006-12-24
J
unio C Ha
m
an
o
Merge bran
c
h
'js/
r
erere'
commit
|
commitdiff
|
tree
2006-12-24
J
o
hannes Schindelin
commit-t
r
ee: encoura
g
e UTF-8 commit
mess
a
ges
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-24
S
hawn O
.
Pearce
Switch git_mmap to use pr
e
ad
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-24
S
haw
n
O
.
Pearce
R
e
nam
e
gitfa
k
emmap to git_mmap
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Ro
b
e
r
t Fitzsim
o
ns
gitw
e
b: Paginate commit
/
a
u
t
hor/committer s
e
arc
h
output
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
E
r
ic Wong
Makefile: add
q
uick-install-d
o
c
f
or instal
l
in
g
pre
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Shawn
O
.
Pearc
e
Display '
t
hei
r
s' branc
h
name wh
e
n possible i
n
m
er
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Sh
a
wn O
.
P
e
ar
c
e
Use extended SH
A
1 syn
t
ax in mer
g
e-re
c
ursive conf
l
icts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
J
u
nio C Hamano
re
f
log
e
xpire
:
do not
p
unt on tags th
a
t point
at non
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsimons
gitweb: Allow
s
e
arch t
o
be disable
d
from the co
n
fig
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsi
m
o
n
s
gitweb:
R
equire a
min
i
m
um of two character f
o
r th
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robe
r
t F
i
tzsimons
g
itweb: Use r
e
v-li
s
t
pattern search
o
ptions
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
N
icol
a
s
Pi
t
re
checkout:
make the m
e
ssage about the
need for a new
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robe
r
t Fi
t
zsimons
g
i
t
we
b
: op
t
i
m
ize git_summ
a
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Ro
b
e
rt Fitzsimons
gi
t
w
eb: optimize git_shortlog_body
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Ro
b
er
t
Fitzsimons
gitweb: optimize git_get
_
last_a
c
tiv
i
ty
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
R
obert Fitzsimons
g
itweb: Add missing show '
.
.
.
' links change
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Brian Gern
h
ardt
Make
g
it-sho
w
-br
a
nch options
s
imilar to git-branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Brian G
e
rnh
a
rdt
Keep "
g
it --g
i
t-dir"
from c
a
u
s
ing a bus err
o
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Eric W
o
ng
git
-
svn: e
n
able common fetch/commit options
f
o
r
dcommit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Alexandre Ju
l
liard
vc-git: Ignore errors ca
u
sed by a non-existent director
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Eri
c
Wong
Remove NO_
A
CCURATE_DI
F
F option
s
f
r
om build
s
ys
t
ems
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
J
u
nio C H
a
m
a
no
git-tag:
l
ose exit after
d
ie
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Junio
C
Hamano
Really
f
i
x
headers for
__FreeBSD__
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
D
o
n
ot su
p
port "partial
URL shorthand"
a
nymo
r
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
J
u
nio
C Hamano
default
pull:
forg
e
t a
b
out "newbie
pro
t
ection
"
for
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Ju
n
io C Hamano
me
r
ge and reset: ad
j
ust
f
or "res
e
t
-
-hard" messages
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
r
e
f
l
og
e
xpire: prune commits that a
r
e n
o
t incomplete
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Ha
m
ano
com
m
i
t-tree: do no
t
overflow MAXPAREN
T
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
Johannes
S
chin
d
elin
Add a
t
est for
g
it-re
r
e
r
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Johan
n
e
s
Schin
d
eli
n
mo
v
e read_mmfile() into
x
di
f
f-interfa
c
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pearce
Don't cras
h
du
r
ing repack of a refl
o
g with pruned commits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio
C
H
amano
Merge branch 'master' into
jc/fsck-re
f
log
commit
|
commitdiff
|
tree
2006-12-22
S
haw
n
O
.
Pearce
Introd
u
ce
a global l
e
v
el warn
(
) function
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
S
hawn
O
.
P
e
arce
R
ename
i
map
-
send's internal info/warn functions
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
_XO
P
EN_SOUR
C
E problem also exis
t
s o
n
Fr
e
eBSD
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
J
u
ni
o
C
Ha
m
ano
parse-remot
e
: mark al
l
refs not
for
m
erge only when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-22
Joha
n
n
es S
c
hindelin
git-reset --hard: tell t
h
e
u
ser
wha
t
the HEAD was reset to
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schinde
l
in
git-tag: suppor
t
-F <f
i
le> opt
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Juni
o
C Hamano
Revert
"git-pull:
r
e
fu
s
e default merge
w
ithout br
a
nch
.
.
.
commit
|
commitdiff
|
tree
2006-12-22
Shaw
n
O
.
Pearce
Sugg
e
st
'
add' in am/
r
evert/c
h
erry-pick
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schindelin
Use git-merge-file in git
-
merge-one-fi
l
e,
too
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Johan
n
es Sc
h
indelin
dif
f
-
-
check:
f
i
x off by on
e
error
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-21
Quy Tonthat
Docume
n
tation
/
git-branch: new -r to delete
r
e
mote-tracki
n
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-21
Terj
e
Sten
Bjerk
s
eth
F
i
x system
header prob
l
ems
o
n M
a
c OS X
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next