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
Use merge-recursive in git-am -3.
2006-12-29
Sha
w
n O
.
P
earce
Use merge-
r
ec
u
r
s
ive in git-a
m
-3
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
P
earce
Allow merging ba
r
e trees in
merge-recurs
i
ve
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Move
b
etter
_
b
ranch_name above get_r
e
f in merg
e
-
r
e
cursive
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-29
Junio C
Ha
m
ano
Merge branch
'
jc/utf8'
commit
|
commitdiff
|
tree
2006-12-29
Juni
o
C Hamano
A
l
low non-fast-forw
a
r
d
of re
m
ote tracking branc
h
es
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-29
J
u
nio
C Ham
a
no
core
.
log
a
llre
f
updates
:
log remotes
/
tracki
n
g bra
n
c
hes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-29
Junio C Hamano
GIT_SKIP
_
T
ESTS: a
l
low users to omit t
e
sts tha
t
ar
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-29
J
u
nio C Hamano
t3900: test conversi
o
n
to
non UTF-8 as well
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-29
Junio C Hamano
Merge branch 'jc/make'
commit
|
commitdiff
|
tree
2006-12-28
J
im M
e
yering
update hook: redir
e
c
t
_both_ diag
n
ostic lines t
o
stderr
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
J
o
hannes Schindelin
x
d
l
_merge(): fix a segmenta
t
ion
f
a
ult when refining
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Eric Wong
git
-
svn: sort multi-init
o
utput
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Eric Wong
g
i
t-svn: verif
y
_ref() should actually --verify
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Eric Wong
git-svn:
pr
i
nt out the SVN library version in --version
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
E
r
ic
W
o
n
g
git-sv
n
: remove non-delt
a
fetch code paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Eri
c
Wong
t9200-g
i
t-cvsexportcommit
.
s
h
:
q
uiet down commit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Eric W
o
ng
tes
t
-
l
ib: quie
t
down init-db output
f
or te
s
ts
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Eric W
o
n
g
t6024-recu
r
sive-merge:
quiet down this test
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Junio C Hamano
M
erge branch
'
js/shallow'
commit
|
commitdiff
|
tree
2006-12-28
S
hawn O
.
Pearce
Allow g
i
t-mer
g
e to select the defau
l
t strategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pea
r
c
e
Honor pull
.
{twohead,octo
p
us
}
in git-
m
erge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pearce
Ensure `g
i
t-pull` fails if `git-merge`
f
ails
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
S
h
awn O
.
Pea
r
ce
Use branch names in '
g
it-re
b
ase -m'
conflict hun
k
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
P
e
arce
Ho
n
or GIT_
R
EFLOG_ACTION in gi
t
-rebase
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pearce
Use GIT_REFL
O
G_ACTION environ
m
ent variable
i
nst
e
ad
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Jakub
Nareb
s
ki
gitweb: Precompile C
G
I rou
t
in
e
s for mod_perl
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
J
akub
N
areb
s
ki
git
w
eb: Add m
o
d_perl version
string
to "generat
o
r"
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Junio C Hamano
Rename t3900
test v
e
cto
r
file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Junio C Hamano
g
c
c does not ne
c
essarily pass run
t
i
m
e libpath with
-
R
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-28
Junio C Hamano
Merge br
a
nch 'sp/g
c
'
commit
|
commitdiff
|
tree
2006-12-28
Junio
C
H
amano
UTF-8
:
introduc
e
i18n
.
log
o
utputenc
o
ding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Juni
o
C Hamano
Set NO_MMAP f
o
r Cygwi
n
b
y
def
a
ult
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'
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Ro
b
ert Fit
z
simons
gitweb:
R
e
-
e
n
able rev
-
l
ist --pa
r
ents
f
or
p
arse_
c
ommit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Qu
y
Tonthat
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
Jun
i
o
C
H
a
m
ano
Me
r
ge bran
c
h 'ma
s
t
er' into js/s
h
a
l
low
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Junio
C
Haman
o
e
v
eryday
:
re
p
l
ace a few 'prune' and 'r
e
pac
k
' with 'gc'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Shawn O
.
Pear
c
e
Cr
e
ate
'
git
g
c
' to pe
r
form c
o
mmon maintena
n
ce ope
r
ations
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hamano
g
i
t
-reflo
g
: gc
.
*
c
onfiguration
a
nd doc
u
menta
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hamano
rer
e
re
g
c
: honor configura
t
ion
a
n
d document
it
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Junio C H
a
ma
n
o
count-objects -
v
: show number of
packs as well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hamano
Me
r
g
e branch '
j
c/fsck-r
e
flog'
commit
|
commitdiff
|
tree
2006-12-27
Jun
i
o C Hama
n
o
everyda
y
:
u
p
date
f
or v1
.
5
.
0
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
Eric Wong
gi
t
-
s
v
n: dcommit should d
i
ff against the cu
r
rent HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-27
E
ric Wong
git-svn: quiet
dow
n
te
s
ts an
d
fix some u
n
port
a
ble
shell
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
A
n
dy Pa
r
k
i
ns
hoo
k
s/co
m
mit-msg: add example t
o
add Signe
d
-off-by
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Nicolas Pi
t
r
e
m
ove git
-
bla
m
e to its plac
e
in
.
giti
g
nore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Nico
l
as Pit
r
e
Add git-reflog to
.
git
i
gnore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Jun
i
o C Ha
m
ano
T
each log family --encod
i
n
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Ju
n
io
C Ham
a
no
i18n
.
logT
o
UT
F
8
: convert commi
t
log
m
essage
t
o
U
T
F-8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
J
u
n
i
o
C
H
a
mano
Mo
v
e e
n
coding con
v
e
r
sion r
o
u
t
ine out of mail
i
nfo
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Junio C Hamano
Document git-reset <commit> -
-
<path
s
>
.
.
.
commit
|
commitdiff
|
tree
2006-12-26
Junio C
H
a
mano
Document
-
-nu
m
sta
t
i
n
g
it-apply
a
nd git-diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Junio C H
a
mano
show-b
r
anch --re
f
log:
add docum
e
n
t
at
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Nicolas Pitre
add
.
mailmap for gi
t
-sh
o
rtlog
o
utput wi
t
h
the git reposi
t
ory
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Junio C Hamano
G
I
T v1
.
5
.
0 previ
e
w
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-26
Juni
o
C Hamano
Merge bra
n
c
h
'jc/bm'
commit
|
commitdiff
|
tree
2006-12-26
Jun
i
o C
H
a
m
ano
Mer
g
e branch '
r
f/web'
commit
|
commitdiff
|
tree
2006-12-26
Junio C
H
a
m
ano
git-add -f
:
al
l
o
w adding otherwise ignored
f
iles
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fit
z
simons
gitwe
b
: Us
e
rev
-
list --ski
p
option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
R
o
bert Fitzsimons
g
i
tweb: Change history act
i
on t
o
u
s
e parse_
c
om
m
i
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
R
obert Fitzsimon
s
gi
t
web:
Change atom, rss actions to use parse_commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fi
t
zsimons
gitw
e
b: Change header search action to use parse_commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fitzsim
o
ns
gitweb: Change log a
c
tion to
u
se parse
_
commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fitzsimons
git
w
eb: Cha
n
ge summary, shortl
o
g actions to u
s
e parse_commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
R
o
bert
Fitzsi
m
o
ns
gi
t
web: We d
o
lo
n
ger need the -
-
par
e
nts flag in rev
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Rob
e
rt Fitzsim
o
ns
gitweb: Add pa
r
se_com
m
its, us
e
d t
o
bulk
l
oad com
m
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Ha
m
ano
git-add
:
wa
r
n
when adding an
i
gnored fil
e
with a
n
explicit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Junio C
H
a
ma
n
o
gi
t
-
a
dd:
ad
d
ignored
f
iles w
h
en a
s
ked
explicitly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
J
u
nio C Hamano
r
e
a
d_direc
t
ory: show_both option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Ham
a
n
o
git-r
m
:
Documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Jun
i
o
C Hamano
t3600: up
d
ate
the te
s
t for updated git rm
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Jun
i
o C
Hamano
git-rm: updat
e
to sa
n
er semantics
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hamano
match_
p
athspec() -- r
e
tu
r
n how well
t
he spec
m
at
c
hed
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-25
Junio C
H
amano
Merge
b
r
anch
'
j
c/skip-count'
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hamano
Merge branch 'jc/git-add
-
-in
t
eractive'
commit
|
commitdiff
|
tree
2006-12-25
Junio
C
Hamano
git-add
--inter
a
ct
i
ve: add docum
e
ntation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-24
Junio C Hamano
All
o
w b
r
anch
.
*
.
m
e
rg
e
to ta
l
k
a
bout
remote tracking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-24
J
u
nio C Hamano
Merge branch
'
sb/merge-friendly'
commit
|
commitdiff
|
tree
2006-12-24
Jun
i
o C Hamano
Merg
e
b
ranch 'js/rere
r
e'
commit
|
commitdiff
|
tree
2006-12-24
Johannes Schindel
i
n
c
o
mmi
t
-t
r
ee: encourage U
T
F-
8
c
o
mmit
m
e
ssages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-24
Shawn O
.
Pe
a
r
ce
Swit
c
h git_mmap to us
e
pread
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-24
Shawn O
.
P
earce
Rename g
i
tfakemmap to
g
it
_
mm
a
p
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
R
o
bert Fitzsimons
gitw
e
b: Pagina
t
e commit/author/committer search output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Er
i
c Wong
Makefile: add
q
uick-install-doc f
o
r inst
a
lli
n
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
' branch
nam
e
when pos
s
ible
in merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Shawn O
.
Pe
a
rce
Use
e
xten
d
ed SHA1 synta
x
in
m
e
r
ge-recu
r
s
ive con
f
li
c
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Junio
C
H
amano
reflog ex
p
ire:
d
o not punt on ta
g
s
t
hat point at non
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
R
o
bert
Fitzsimons
g
i
t
w
eb:
A
llow search to be disa
b
led from the c
o
n
fi
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsimons
git
w
eb: Require a minimu
m
of
t
wo charact
e
r for the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert
Fi
t
zsimons
g
i
tweb: U
s
e rev-list pattern search opti
o
ns
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
N
i
c
olas
Pitre
c
h
eckout: make
the
mess
a
ge about the
ne
e
d fo
r
a new
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Ro
b
e
r
t Fitzsimons
gitweb: optimiz
e
git_summary
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert
Fitzsimons
gitweb: opti
m
i
ze git_sh
o
rtlo
g
_body
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fi
t
zsimons
gitweb: opt
i
mize git_get_l
a
st_activity
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Rob
e
rt Fitzsimo
n
s
gitweb
:
Ad
d
missi
n
g
show '
.
.
.
' links
cha
n
ge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
B
r
i
an
G
e
r
n
hardt
Make git-show
-
bra
n
ch options similar to git-branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Brian Gernhardt
Keep "git
--git-dir" from
c
ausi
n
g a b
u
s
e
rror
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Eric Wong
git-svn: enable co
m
mon fe
t
ch
/
commit option
s
for
d
commit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-23
Alexandre
Julliard
vc-git: Ignore errors caused by a
no
n
-
ex
i
stent directory
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next