repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Honor pull.{twohead,octopus} in git-merge.
2006-12-28
Shawn O
.
Pearce
Honor p
u
ll
.
{twohea
d
,octopus} i
n
git-merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Sh
a
wn O
.
P
e
a
rc
e
Ensure `git-pull` fails if `git
-
me
r
ge` fails
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
P
e
a
rce
Use branch names i
n
'
g
it-rebase
-m' co
n
fli
c
t hun
k
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
S
h
awn O
.
Pearce
Honor
G
IT_REFLOG_ACTION in gi
t
-rebas
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
P
earce
U
s
e
G
IT_REFLOG_
A
CTION e
n
vironment variabl
e
inste
a
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Jakub Narebs
k
i
gitwe
b
:
P
recompile CGI r
o
uti
n
es for mod_pe
r
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
J
a
kub Nar
e
b
ski
gitweb: A
d
d mod_per
l
v
e
rsi
o
n stri
n
g
to "generator"
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Jun
i
o C
H
amano
Merge
bran
c
h 's
p
/gc'
commit
|
commitdiff
|
tree
2006-12-27
Juni
o
C
Haman
o
Set NO_MMAP for Cygwin by d
e
fault
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Junio
C
Hamano
Use
'repack -a -d -
l
' instea
d
o
f
'r
e
pack
-
a -d'
in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Robert Fitz
s
imons
gitw
e
b: R
e
-e
n
able rev-l
i
st
-
-parents
for parse_co
m
m
i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Quy Tonthat
git-send-email:
default value for "From
:
"
field
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hamano
everyda
y
:
rep
l
a
c
e
a
few 'prune' and 'repack'
w
ith 'g
c
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Shawn O
.
Pearce
Cr
e
at
e
'git gc' t
o
perform common maintenance oper
a
t
ions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hamano
g
i
t-re
f
log
:
gc
.
* configuration and do
c
umentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
J
u
nio
C
H
amano
rere
r
e
g
c
:
honor
c
onfiguration an
d
document it
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Junio
C Hamano
count-o
b
j
e
cts -v: show number of packs as wel
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hamano
Mer
g
e branc
h
'jc/fsck-r
e
f
l
og'
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hamano
everyda
y
: update for v1
.
5
.
0
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Eri
c
Wong
git-svn:
d
comm
i
t sh
o
u
l
d diff against the current
H
EAD
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Eric W
o
ng
git-svn: quiet down t
e
s
ts and fix some unpor
t
able shell
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Andy Parkins
hooks/commi
t
-
m
sg: add ex
a
mple to
add Signed-off-by
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
N
i
colas P
i
tre
move git-blame to i
t
s place in
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Ni
c
olas
P
itre
Add git-reflog to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
J
u
nio C Haman
o
Document g
i
t-reset <
c
ommi
t
> -
-
<paths>
.
.
.
commit
|
commitdiff
|
tree
2006-12-26
J
u
nio C Hamano
Document --nu
m
stat in git-apply
a
n
d git-diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Junio C Hamano
show-branch --reflog: add documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Ni
c
olas
P
itre
add
.
mailma
p
for g
i
t-
s
hortlog output with the git repository
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Junio C Hamano
GIT
v1
.
5
.
0 preview
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Junio
C Hamano
M
e
rge bran
c
h '
j
c/
b
m'
commit
|
commitdiff
|
tree
2006-12-26
Junio C
H
ama
n
o
Merge
b
ranch 'rf/web'
commit
|
commitdiff
|
tree
2006-12-26
Junio C Hamano
git-add -f: al
l
ow adding oth
e
r
wise ignored files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
R
o
bert Fitzsimons
gitweb: Us
e
rev-list
--skip opt
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
R
obert Fitzsimons
gi
t
web: Change hist
o
ry
a
ction to use
p
arse_commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fitz
s
i
mons
gitweb: Change ato
m
, rss
act
i
ons to us
e
par
s
e
_commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Rob
e
rt Fitzsim
o
ns
gitweb: Change h
e
ader search a
c
t
i
on to
u
se parse_c
o
mmits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Rob
e
r
t
Fitz
s
imons
gitweb: Change log action
to
u
se parse_commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Ro
b
e
r
t
Fitzsimons
g
i
t
web: Cha
n
g
e
summary, sho
r
tlog actions
t
o us
e
parse_commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Robert
Fitzsimons
gitweb: We
do longer
need the -
-
pare
n
ts fla
g
in re
v
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Rob
e
rt Fit
z
s
i
m
ons
gitweb:
Add parse_commits, used to bulk
load co
m
mit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Ham
a
n
o
git-add:
warn when adding an ignored fi
l
e with an e
x
plicit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Junio
C
Ham
a
no
git-add: add ig
n
ored files
when
as
k
ed explicitl
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Ham
a
no
read_directory: show_bot
h
opti
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hamano
gi
t
-rm: Documenta
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Junio
C
H
a
mano
t3600: u
p
d
ate
t
he te
s
t fo
r
updated git rm
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Jun
i
o C Hamano
git-
r
m:
update to sane
r
s
emantics
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Jun
i
o C
Hamano
match
_
p
a
thspec() -- return how
well the spec matched
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hamano
M
e
r
ge branch 'j
c
/ski
p
-count'
commit
|
commitdiff
|
tree
2006-12-25
J
u
nio C Haman
o
Merge branch
'jc/git-
a
dd--interact
i
ve'
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hamano
g
i
t-add --interactive:
add documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-24
Ju
n
io
C
H
amano
Allow branch
.
*
.
merge
t
o talk ab
o
ut
remote t
r
ack
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-24
Ju
n
io C Ha
m
ano
Merge branch 'sb/merge-friendly'
commit
|
commitdiff
|
tree
2006-12-24
J
u
nio C Haman
o
Merge
branch
'js/rerere'
commit
|
commitdiff
|
tree
2006-12-24
Johannes Schindelin
c
ommit-tree
:
enc
o
ur
a
ge UTF-8 commit
messag
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-24
Shaw
n
O
.
Pearce
Switch git_
m
map
to use pread
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-24
Shawn O
.
Pear
c
e
Rename gitf
a
kemmap to
g
it_m
m
ap
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsimons
gitweb
:
Paginate commit/author
/
committer search output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Eric Wong
Makefile: add quick-install-d
o
c for installing pre
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Sh
a
wn O
.
P
e
arce
Disp
l
ay '
t
heirs' branch nam
e
w
hen possible in merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
S
haw
n
O
.
Pearce
Use extended
S
HA1
syntax in merge-recursive confli
c
ts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Junio C Hamano
reflog
e
xpire:
d
o
n
o
t
p
unt on tags that poin
t
at
n
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Rober
t
Fitzs
i
mons
gitweb: Allow search to be di
s
ab
l
ed
fr
o
m the config
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Ro
b
ert Fitzsi
m
o
n
s
gitweb: Require a
minimum of two
cha
r
acter for the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robe
r
t Fitzsimons
g
i
t
web: Use rev
-
lis
t
pattern se
a
rch options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Nicola
s
Pitre
checkout:
m
ake the message a
b
out the need for
a new
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsimons
gitweb: optimize git_su
m
mary
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsimon
s
g
itweb: op
t
imize git_sho
r
tlog_bod
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsimons
gitweb: optimiz
e
git_g
e
t_last_a
c
tivity
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
R
obert Fit
z
si
m
ons
gitw
e
b: A
d
d missi
n
g
s
how '
.
.
.
'
l
inks change
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Brian Ge
r
nhar
d
t
Mak
e
git-show-branch options similar to git-branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Br
i
an
G
e
rnhardt
K
e
ep "git --git-d
i
r" fr
o
m c
a
u
sing a bus er
r
or
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Eric Wong
git-svn: e
n
able commo
n
fet
c
h/commit op
t
ions for dco
m
m
it
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Alexandre Julliard
vc-git: Ignore
errors c
a
us
e
d by
a
non-ex
i
sten
t
directory
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Eric W
o
n
g
Remo
v
e NO_ACC
U
RATE_DIF
F
options f
r
om build systems
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Junio C Hamano
git
-
tag
:
l
o
se exit after die
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Jun
i
o C Hamano
R
e
ally fix headers for __
F
reeBS
D
__
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Ju
n
io C
Ham
a
no
Do not
s
upport "pa
r
ti
a
l URL sho
r
thand" anymor
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio C
Hamano
de
f
a
u
l
t pul
l
: forget about
"newb
i
e
p
r
otection"
f
or
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
J
uni
o
C
H
amano
merge
and
reset: adjust for "
r
eset --hard" mes
s
ages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
r
e
flog expire: p
r
u
ne commits
that are not i
n
complet
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio
C Hamano
co
m
m
i
t
-tree: do not ove
r
f
l
ow MAX
P
ARENT
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schindel
i
n
Make git-r
e
rere a b
u
il
t
in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schindel
i
n
Add a tes
t
for git-rer
e
re
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Joha
n
n
es
Schindelin
mov
e
read_mmfile() i
n
to
xdiff-i
n
terface
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
P
e
ar
c
e
D
on't
c
r
a
sh during repa
c
k of a ref
l
og with pruned co
m
m
i
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio C
H
ama
n
o
Merge branch 'master' into jc/fsck-r
e
flog
commit
|
commitdiff
|
tree
2006-12-22
Shaw
n
O
.
P
e
arce
Intr
o
d
uce a g
l
obal level war
n
() func
t
i
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Shaw
n
O
.
Pe
a
rce
Rename imap-send
'
s int
e
rnal
i
nfo/warn fu
n
ctions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
J
unio C Hama
n
o
_XOPE
N
_
SOUR
C
E problem also exists
on F
r
eeBSD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
pars
e
-remote
:
mark a
l
l refs not for merge only w
h
en
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio C
Hamano
Merge br
a
nch 'ma
i
nt'
commit
|
commitdiff
|
tree
2006-12-22
Johannes Sc
h
i
n
delin
g
i
t
-reset -
-
hard: tell the user
w
h
at th
e
HE
A
D was r
e
s
et to
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
J
ohannes Sc
h
indelin
git-tag: suppor
t
-
F
<
file> option
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Junio C H
a
m
a
no
Revert "git-pu
l
l: ref
u
se default merg
e
wit
h
o
ut bra
n
ch
.
.
.
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pearce
Suggest 'add' in am/reve
r
t/cherr
y
-pick
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schindelin
Use gi
t
-merge-file i
n
g
i
t-merge
-
one-
f
ile, to
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-22
Johannes
S
chindel
i
n
diff --check
:
f
i
x o
f
f by o
n
e error
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-21
Q
u
y
T
o
n
that
Doc
u
mentation/git-branch: new -r
t
o
d
e
l
e
te re
m
ot
e
-tracking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-21
Terje Sten Bje
r
k
seth
Fix
s
y
s
tem
h
eader prob
l
ems on Mac
OS X
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-21
Ju
n
io C
H
amano
git reflog e
x
p
ire
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next