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
xdl_merge(): fix a segmentation fault when refining conflicts
2006-12-28
Johannes Schindelin
xdl
_
merge(): fix a segmentation fault when r
e
fining
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Eric Wong
git-svn: sort
m
ulti-
i
nit outpu
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
E
ri
c
W
o
ng
git-s
v
n
: verify_
r
ef() should actually --verify
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Eric
W
ong
git-s
v
n
: print out
th
e
SVN li
b
rary vers
i
on in --version
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
E
r
ic
W
ong
git
-
svn: remove non-d
e
lta
f
etch code
p
a
t
h
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Eric
W
ong
t9200-
g
it-cvsexport
c
ommit
.
s
h
:
q
u
i
et down com
m
it
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Eric Wong
t
e
st-lib: quiet down
i
nit-
d
b outpu
t
for tests
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Eric Wong
t6024-r
e
cur
s
ive-merge: quiet down
th
i
s
t
e
st
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Junio C Hamano
M
erge
b
ranch 'js
/
sha
l
low'
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pearce
Allow git-merg
e
to select the def
a
ult strategy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pearce
Ho
n
or pull
.
{twohead,octo
p
us} in
g
it-mer
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Sh
a
w
n O
.
P
e
a
rce
Ens
u
re
`
gi
t
-pull` fails if `git-merge` fails
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Shawn
O
.
Pearce
Use branch names in
'
git-rebase -
m
' conflict hunks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
S
ha
w
n O
.
Pearce
Honor G
I
T_R
E
FLOG_ACTIO
N
in git-rebase
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Shaw
n
O
.
Pear
c
e
U
se GIT_REFLOG_ACTI
O
N environment variab
l
e
i
n
stead
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Jakub Narebski
gitweb:
P
recompile CGI routin
e
s
for mo
d
_perl
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Jaku
b
Narebski
git
w
eb
:
A
d
d mo
d
_perl version string to "generator
"
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Junio C Hama
n
o
Merge bran
c
h '
s
p/gc'
commit
|
commitdiff
|
tree
2006-12-27
J
unio C Hamano
Se
t
N
O
_MMAP for Cygwin
b
y default
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Junio C H
a
mano
Use '
r
epack -a -d -l'
i
nstead of
'
rep
a
ck -a -d' in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Robert F
i
tz
s
imons
g
itweb: Re-enable
r
ev
-
list
-
-
pa
r
ents f
o
r p
a
rse_commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Q
u
y
T
onthat
gi
t
-send-email: default value for "Fro
m
:"
field
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Jun
i
o C H
a
mano
Me
r
ge b
r
a
n
ch 'master'
into js
/
shallo
w
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Ju
n
io
C
Ha
m
ano
everyday: replace a fe
w
'prune'
and 'repac
k
' with 'gc'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Shawn O
.
Pearce
Create 'git g
c
' to
p
erform common maintenance operations
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Jun
i
o C Hamano
git-re
f
log: gc
.
* configuration and doc
u
ment
a
tion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Junio C
H
ama
n
o
rerer
e
gc: honor co
n
fig
u
ra
t
ion and documen
t
i
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hamano
coun
t
-o
b
jects -v: show number of packs as we
l
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hamano
Merge branch 'jc/fsck-reflo
g
'
commit
|
commitdiff
|
tree
2006-12-27
Junio C Ham
a
no
e
v
e
ryday: update fo
r
v
1
.
5
.
0
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Eric Won
g
gi
t
-svn: dcommit should diff against
t
he current
HEAD
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Eric
Wong
git-svn: quiet down tes
t
s and
f
ix some unportable shell
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
A
n
dy Parkins
h
o
o
ks/commit-
m
sg: add example to
add Signed-off-by
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Nicolas Pitre
move git-blame t
o
its place in
.
g
i
tigno
r
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Nico
l
as Pitre
Add git-reflo
g
t
o
.
g
i
tigno
r
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Juni
o
C Haman
o
Docum
e
nt git-
r
eset
<
commit
>
-
- <paths
>
.
.
.
commit
|
commitdiff
|
tree
2006-12-26
J
u
n
i
o C Ham
a
no
Document
-
-numst
a
t in git-apply and git-
d
iff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Junio C H
a
man
o
show-branch --reflog: add doc
u
mentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Nicolas Pitre
add
.
mailmap for
g
it-shortlog o
u
tput with
t
he
g
it repository
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Junio C Hamano
G
IT v1
.
5
.
0 p
r
e
vie
w
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Junio C Ha
m
ano
M
erg
e
branch 'jc/bm'
commit
|
commitdiff
|
tree
2006-12-26
Junio C Ha
m
ano
Merge branch
'rf/web'
commit
|
commitdiff
|
tree
2006-12-26
J
unio C
H
amano
git-add -f: all
o
w
a
dding
o
therwise ignore
d
fil
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
R
o
bert Fitzsimons
gitweb: Use r
e
v-list --skip option
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fitzsimons
gitweb
:
Change
h
istory action to
u
se
p
a
rse_commits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robert F
i
tzsimons
git
w
eb:
C
h
a
n
ge atom, rss
a
c
tions to use parse_c
o
mmits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robert
F
itzsimons
gitweb: Change header se
a
rch action to use parse_
c
ommits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robert
F
itzsimons
gitweb: Change log action to use parse_commits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Rob
e
rt Fitzsimons
g
it
w
eb: Change
s
ummary, shortlog actions to u
s
e parse_commits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robert F
i
tzsimon
s
g
itweb:
We do longer
n
ee
d
the --parent
s
f
l
ag in rev
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fitz
s
imon
s
gitw
e
b: A
d
d pars
e
_commit
s
, used
to
b
ulk
l
oad commit
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
J
u
nio C Haman
o
git-add:
warn when adding an i
g
nored file with an explicit
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Ham
a
no
g
it-ad
d
: add ignored
files when
asked expl
i
c
itly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hamano
read_directory: show_both option
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hamano
git-rm: Docu
m
entation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hamano
t
3
600: update
t
he test
f
or updat
e
d git rm
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hamano
git-rm:
u
pdate to
sane
r
semanti
c
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
J
u
n
io C H
a
mano
m
atch_pathspec(
)
-- ret
u
rn how w
e
l
l the spec mat
c
he
d
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
J
unio C Hamano
Merge
b
r
a
nch 'jc/skip-count'
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hamano
M
erge bra
n
ch 'jc/git
-
add--interactive'
commit
|
commitdiff
|
tree
2006-12-25
Junio C Ham
a
no
gi
t
-add --interactive: add d
o
c
u
me
n
tation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-24
Junio C Hamano
Allow branc
h
.
*
.
m
erge to talk
a
bou
t
remote
tracking
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-24
Jun
i
o C Hamano
Merge branch '
s
b/me
r
ge-fr
i
endly'
commit
|
commitdiff
|
tree
2006-12-24
Junio
C
Hamano
Merge branch 'js/r
e
rere
'
commit
|
commitdiff
|
tree
2006-12-24
Johann
e
s Schindel
i
n
c
ommit-tree
:
e
ncourage
UTF-8 commit messages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-24
Shawn O
.
Pearce
Switch
g
i
t_mmap
to use
p
read
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-24
Shawn O
.
Pearc
e
Rename gitfakemma
p
to git_mmap
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
R
obert Fitzsi
m
o
n
s
gitweb: Paginate commit
/
a
uthor/c
o
mmitter search outp
u
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Eri
c
Wong
M
a
kefile: add quick-install-doc for
i
nstallin
g
p
r
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Shawn
O
.
Pear
c
e
Display '
t
hei
r
s' bra
n
ch name whe
n
possible in merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Shawn O
.
Pe
a
rce
Use
e
xt
e
nded
S
H
A1 syntax in merge-recurs
i
ve confl
i
ct
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Ju
n
io C Hamano
reflog expire: do
n
ot
p
unt on t
a
g
s
that
p
oint at non
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robert F
i
tzsimons
g
i
tw
e
b:
All
o
w search to be disab
l
ed fr
o
m the conf
i
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
R
o
b
e
r
t
Fitzsimons
g
i
tweb: Require a minimum of t
w
o
c
har
a
ct
e
r for the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Rob
e
rt Fitzsimons
gitweb: Us
e
r
e
v-list pattern sea
r
c
h op
t
i
o
n
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
N
i
c
o
las Pitre
c
h
e
ckout: make the messag
e
a
b
out th
e
need for
a ne
w
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robert
F
it
z
simons
git
w
eb: optimize git_summary
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fit
z
simons
gitweb: o
p
ti
m
ize git_shor
t
log_body
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsi
m
ons
g
itweb: optimize g
i
t
_
g
et_last
_
activity
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robert
Fitz
s
imons
gitw
e
b
:
Add
mis
s
ing
s
how '
.
.
.
'
links cha
n
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Brian Gernhardt
Make git-show-b
r
anch op
t
ions
similar to git-
b
r
anc
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Brian Gernhardt
K
ee
p
"git --git-di
r
" from
c
a
u
s
ing a
bus error
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Eric Wong
g
it-
s
v
n
: enab
l
e
c
o
m
mon fet
c
h
/
c
o
m
mit o
p
tio
n
s for dcommit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Alexand
r
e Julliard
vc-git: Ign
o
re errors cau
s
ed by a
non-existent directory
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Eric
Wong
Rem
o
ve NO_ACCUR
A
T
E
_DIFF opt
i
ons from
build systems
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Jun
i
o C H
a
ma
n
o
g
i
t-t
a
g: lose
exit af
t
er die
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Juni
o
C Ha
m
ano
Really fix he
a
der
s
f
or __FreeBSD__
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio
C Hama
n
o
D
o
not support "par
t
ia
l
URL sh
o
rthand" anymor
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
J
u
n
i
o
C Hamano
d
e
f
a
ult pull: forget about
"
newbie protection"
f
or
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hama
n
o
me
r
ge and reset: adjust for "r
e
set --hard"
mes
s
ages
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
J
u
nio C Hamano
re
f
log
e
xpire:
p
rune
comm
i
ts that are no
t
in
c
omplete
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
commit-tre
e
: do not o
v
er
f
low MAXPARENT
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
J
o
hannes Sch
i
ndelin
Make git-re
r
ere a b
u
ilt
i
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
J
oha
n
nes S
c
h
i
ndelin
Add
a
te
s
t for git-rerere
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
J
ohannes Sc
h
indelin
move
r
ead_mmfile() into xdi
f
f-in
t
erface
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
S
h
awn O
.
Pearce
Don
'
t crash
durin
g
repack of a reflo
g
with pru
n
ed c
o
mmits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio
C
Hamano
Merge
branch 'master' into jc
/
fsck-re
f
log
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pearce
I
n
t
roduce
a
global lev
e
l warn() func
t
ion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
S
hawn O
.
Pea
r
ce
Rename imap-send's internal info/warn f
u
nctions
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Haman
o
_X
O
P
EN_SOURCE pro
b
l
e
m also e
x
i
s
ts on FreeB
S
D
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next