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
Move better_branch_name above get_ref in merge-recursive.
2006-12-29
Shawn
O
.
Pearce
Move bette
r
_bran
c
h_name a
b
ove get_ref i
n
me
r
ge-recurs
i
ve
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-29
Juni
o
C
Hamano
Merge branch
'
jc
/
utf8'
commit
|
commitdiff
|
tree
2006-12-29
Junio C Hamano
Allow non-fast-forwar
d
of
rem
o
te tracking branches
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-29
Junio C
H
amano
co
r
e
.
loga
l
lrefupd
a
tes: log remot
e
s/ tracking
b
ranches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-29
Junio C
H
amano
GIT_SKIP
_
TEST
S
:
all
o
w users to
o
mi
t
tests that are
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-29
Jun
i
o
C Hamano
t3900:
test co
n
ver
s
i
o
n t
o
non UT
F
-
8
as well
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-29
Junio
C
Hamano
Merge
b
ranch 'jc
/
mak
e
'
commit
|
commitdiff
|
tree
2006-12-28
Jim Meyerin
g
up
d
ate
hook: re
d
irect _both_ diagno
s
t
i
c lines
t
o
s
tderr
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
J
ohan
n
es Schi
n
delin
x
d
l_merge(
)
: fix a seg
m
entation
f
au
l
t when re
f
ining
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Eri
c
Wong
g
i
t-svn: sort mult
i
-
i
nit output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Er
i
c Wong
git-svn: ver
i
fy_
r
e
f() should
a
ctu
a
lly --ve
r
ify
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Eric Wong
gi
t
-svn: print out t
h
e SVN library version in -
-
version
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Eric Wo
n
g
git-s
v
n: remove n
o
n-delta
f
etch cod
e
paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
E
ric Wong
t9
2
00-git-cvsexportcommit
.
sh: quiet d
o
wn commit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Eric
Wong
test-lib: quiet down init-
d
b outp
u
t for
t
ests
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Eric Wong
t6024-recurs
i
ve-merge:
q
uiet down this
tes
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Ju
n
io C Hamano
M
e
rg
e
b
r
anch 'js
/
shallow'
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pearce
Allow git-merge to select the d
e
fault strategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
P
e
arce
H
o
nor pull
.
{two
h
ead,octopu
s
} in
gi
t
-m
e
rge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
S
hawn O
.
Pearce
En
s
ure `g
i
t-pull
`
f
a
ils if
`
gi
t
-
merge` fails
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
S
h
awn
O
.
Pearce
Use
b
ranch names in 'git
-
re
b
ase -m'
c
o
nflict hunks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Sh
a
wn O
.
P
e
arce
Honor GIT_REFL
O
G
_ACTION
i
n
git-rebase
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Sha
w
n O
.
Pearce
Use GIT_REFLOG_ACTION environment v
a
ri
a
ble inst
e
a
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Jakub
N
areb
s
ki
gitweb
:
Pr
e
compile
C
G
I
routines for
mod_perl
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
J
a
kub Narebski
gitweb:
A
dd
m
od_
p
erl version
s
tring to "ge
n
erator"
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
J
unio C
H
ama
n
o
Rename t39
0
0 test
vecto
r
file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Junio C Hama
n
o
g
c
c does not necessarily pass ru
n
time libpath with -R
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Junio C Hamano
M
erge branch 'sp/gc'
commit
|
commitdiff
|
tree
2006-12-28
Ju
n
io C Ha
m
ano
U
T
F-8
:
in
t
roduce
i
18n
.
logou
t
putencoding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Junio C
H
a
mano
Set
NO_MMAP f
o
r Cyg
w
in by
default
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Juni
o
C
H
aman
o
Us
e
'repack -a
-d -l' instead of
'
r
e
pa
c
k
-a -d' in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Robert Fitzsimons
gitweb: Re-en
a
ble rev-list -
-
p
a
rents for parse_commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Quy To
n
that
git-
s
end
-
email: default value
f
or "From:" field
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
J
uni
o
C
Hamano
M
e
rge branc
h
'm
a
ster
'
into js/shall
o
w
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Jun
i
o C Hamano
everyday: replace a few
'
prune' and 'r
e
pack' with
'gc'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Shawn O
.
Pearce
Create 'git
g
c'
t
o perform comm
o
n ma
i
nte
n
a
n
ce operation
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Jun
i
o
C Hamano
g
it-re
f
log:
g
c
.
* configurati
o
n and d
o
cumentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Ju
n
io
C Hamano
rerere gc: ho
n
or
c
onf
i
guration an
d
document i
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hamano
c
o
u
nt-
o
bjects -v: show
number
o
f
p
a
cks as
well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hamano
Merge bran
c
h
'
jc/fsck-reflog'
commit
|
commitdiff
|
tree
2006-12-27
Junio C
Hama
n
o
eve
r
y
day: update for v1
.
5
.
0
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Eric Wong
git-svn:
dcommit sho
u
ld diff again
s
t the current HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
E
r
ic Wong
git-svn: quiet down tests
a
n
d fix
s
ome
unport
a
ble shell
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Andy Park
i
ns
hooks/commit-
m
s
g
:
a
dd ex
a
mple to add Signed-off-by
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Nicolas
P
i
t
r
e
m
o
ve git-blam
e
to
its place
i
n
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Nic
o
las Pitre
Add
git-reflog to
.
gi
t
ignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
J
u
nio C
H
amano
Teach log fa
m
i
l
y --e
n
coding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
J
unio
C H
a
mano
i18n
.
log
T
oU
T
F8:
co
n
v
e
rt comm
i
t log
message to UTF-8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
J
u
n
i
o
C Ham
a
no
Move encoding conversion rout
i
ne out of
m
a
ilinfo t
o
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Junio
C
H
a
m
ano
Document g
i
t-reset <c
o
mmit> -- <paths>
.
.
.
commit
|
commitdiff
|
tree
2006-12-26
Junio C H
a
m
a
no
Documen
t
--nums
t
a
t
i
n
g
it-a
p
ply
a
nd g
i
t
-
diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Junio C Hamano
show-bran
c
h --reflog: add documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Nicolas
Pitre
a
d
d
.
mailmap
for
g
it-shortlog output with the git repository
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Ju
n
io C Hama
n
o
G
I
T
v1
.
5
.
0
pre
v
i
ew
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Jun
i
o C Hamano
Merge bra
n
ch 'jc/bm'
commit
|
commitdiff
|
tree
2006-12-26
Junio C Hamano
Mer
g
e
branc
h
'rf/web
'
commit
|
commitdiff
|
tree
2006-12-26
Junio C
Hamano
git-add -
f
: allow adding otherwise ignor
e
d file
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
R
o
bert Fitzsimons
g
itweb:
U
s
e re
v
-list --skip opti
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Robert F
i
tzsimons
gitw
e
b: Change h
i
story actio
n
t
o use
p
arse_co
m
mits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Robert
F
itzsimons
gitweb: Change at
o
m, rss actions
t
o use parse_commi
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fitzsim
o
ns
gi
t
web: Change h
e
ader search
a
ct
i
on to u
s
e parse_
c
o
mmits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Robe
r
t F
i
tzsi
m
ons
git
w
eb: Change log
a
ctio
n
to
use parse_commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
R
o
bert Fitzs
i
mons
g
itweb: Change su
m
mary, shortlog action
s
to use parse
_
commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fitzsimons
gitw
e
b: We do
lo
n
ger need the
-
-
parents flag in rev
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Robert F
i
t
z
sim
o
ns
gitweb: Add parse_commits, used to bulk load commit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hamano
gi
t
-add: warn when ad
d
i
ng an
ignored f
i
le
with an
explicit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Ju
n
i
o C Hamano
git-add: add ignored files w
h
en asked
e
xplicitly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hamano
r
e
ad_dire
c
to
r
y: show_b
o
th option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Ha
m
an
o
git-rm:
D
ocumentati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
J
unio C Hamano
t36
0
0:
up
d
ate the test
f
or updated
g
i
t
rm
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Haman
o
git-r
m
:
upd
a
te to saner seman
t
ics
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Juni
o
C Haman
o
match
_
p
a
t
hspec
(
)
-- return h
o
w well th
e
spec matc
h
ed
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hamano
Merge branch
'jc/skip-
c
ount'
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hamano
Merge branch 'jc/g
i
t-add-
-
interactive'
commit
|
commitdiff
|
tree
2006-12-25
Junio
C
Ha
m
ano
gi
t
-add --interactive:
a
d
d
docu
m
en
t
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-24
Junio C
H
a
m
an
o
All
o
w branc
h
.
*
.
merge to
talk abo
u
t
r
emote tracking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-24
Junio C Hamano
M
e
rge bra
n
ch
'
sb
/
m
e
rge-friendly'
commit
|
commitdiff
|
tree
2006-12-24
Juni
o
C
H
amano
Merge branch 'js
/
rerere'
commit
|
commitdiff
|
tree
2006-12-24
Johannes Schindeli
n
commit-tree: en
c
o
u
rage UTF-8 commit mes
s
ages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-24
Sha
w
n O
.
P
e
arce
S
witch 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
R
ename gi
t
fakemmap
t
o
git
_
mmap
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitz
s
imons
gitweb:
P
aginate commit/author/comm
i
tter s
e
arch outp
u
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Eri
c
Wong
Make
f
il
e
: add quick-insta
l
l-d
o
c for installing pre
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
S
h
awn O
.
Pearce
D
i
s
p
lay
'
th
e
irs' branch name when pos
s
ible in merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Shawn O
.
Pearce
Use ex
t
e
n
d
e
d SH
A
1 syntax
i
n m
e
rge-recursive conflicts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Junio C Hamano
ref
l
og expi
r
e
:
d
o
not p
u
nt on tags
t
ha
t
point at n
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsim
o
ns
g
i
tweb: Allow se
a
rc
h
to be disabled from the config
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsimons
gitweb: Req
u
i
re a minimu
m
of two ch
a
racter
for the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Ro
b
ert Fitzsimons
gitwe
b
: Use rev-list pat
t
ern se
a
r
ch options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
N
icolas Pitre
chec
k
out: make the message
a
bout the need for
a
n
e
w
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert
F
i
tzs
i
mons
gitweb: optimize git_s
u
mmary
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Ro
b
er
t
F
itzsimons
gitw
e
b: o
p
t
i
mize git_shortlog_body
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Rob
e
rt Fitzsi
m
on
s
gitweb:
o
pt
i
mize gi
t
_get_la
s
t_activity
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Ro
b
ert Fitzsimons
gitweb: A
d
d missing show '
.
.
.
'
links change
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Brian Ge
r
nha
r
dt
Make g
i
t-show-branch options
similar
to git-b
r
anch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Brian Gernhardt
Keep
"g
i
t --git-dir"
f
r
o
m causing a bus er
r
or
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Eric W
o
ng
git
-
svn: enab
l
e common
fetch/c
o
mmit
o
ptio
n
s for
d
c
ommit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Alexa
n
dre Julliar
d
vc
-
g
i
t
: Ignore erro
r
s
c
a
used
b
y
a
non-existen
t
directory
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Er
i
c Wong
R
em
o
ve N
O
_ACCU
R
ATE_DIFF options from build systems
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Juni
o
C H
a
m
a
n
o
git-tag: l
o
s
e exit after
d
ie
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next