repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint'
2008-03-13
Junio C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-03-13
Johannes Schind
e
lin
gc: call "prune
--expire
2
.
weeks
.
ago" by default
commit
|
commitdiff
|
tree
2008-03-13
Junio C Hamano
Documentation/config: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-13
Marc-Andre Lureau
git-cvsimpo
r
t:
fix merging with
remote p
a
re
n
t branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-12
Jakub Na
r
e
bs
k
i
gitweb: Fi
x
bu
g
in href(
.
.
.
, -r
e
p
l
ay=>1) wh
e
n using
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-12
J
u
nio C Hamano
Merge git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-03-12
Junio C Hama
n
o
Merg
e
branch 'js/remote'
commit
|
commitdiff
|
tree
2008-03-12
J
u
nio C Ha
m
ano
Merge br
a
nch 'lt/u
n
pack-tr
e
e
s
'
commit
|
commitdiff
|
tree
2008-03-12
Samu
e
l Tardieu
"r
e
mote
update
"
: print remote nam
e
being f
e
tched from
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-12
J
u
n
i
o
C
Ham
a
no
Merge bran
c
h
'm
a
int'
commit
|
commitdiff
|
tree
2008-03-12
Marc
-
Andr
e
Lureau
g
i
t-
s
vn: fix find-
r
ev e
r
ror
m
essage w
h
en miss
i
n
g
a
r
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-12
Je
f
f King
t0
0
2
1
: tr por
t
a
b
ility fi
x
for
Solaris
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-12
Joha
n
nes S
c
hindelin
lau
n
ch
_
editor()
:
allow
spaces
in the filename
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-12
M
ike Hommey
git reb
a
se --abo
r
t:
al
w
a
y
s resto
r
e the right comm
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-11
Junio C Hamano
Merge branch 'jc
/
cherry-p
i
c
k
' (early part)
commit
|
commitdiff
|
tree
2008-03-11
Junio C Hamano
Merge branch
'
main
t
'
commit
|
commitdiff
|
tree
2008-03-11
Ju
n
io C H
a
mano
Merge
b
ranch 'kb/maint-filter-b
r
anch-disappear'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2008-03-11
Juni
o
C
H
ama
n
o
Merge
b
r
anch 'aw/ma
i
n
t
-
s
ho
r
tlo
g
-blank-lines'
i
n
t
o m
a
int
commit
|
commitdiff
|
tree
2008-03-11
Lin
u
s Torval
d
s
unpack_t
r
e
e
s(): fix diff-inde
x
r
egression
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-11
SZEDER
Gábor
u
p
date
'
git rebase'
doc
u
mentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-10
Junio
C Hamano
t
raverse_
t
rees_rec
u
rsiv
e
(
)
:
propagate merge
e
rrors up
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-10
J
unio C Hamano
git-pull d
o
cumenta
t
i
o
n
: war
n
about the optio
n
or
d
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Lin
u
s
T
orvalds
unpack
_
t
re
e
s():
minor memory
leak f
i
x in unused
destinat
i
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
L
inus Torvalds
Make
'
un
p
ac
k
_t
r
ees
(
)' have a sepa
r
ate sourc
e
and destination
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Lin
u
s
T
orvalds
Make 'unpack_
t
ree
s
()
'
take the
index to
work on as
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
Add 'const
'
whe
r
e appropriate to
index handl
i
n
g functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Linu
s
T
orv
a
lds
F
ix
t
ree-walking compare_entry() in t
h
e
p
resense
of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torva
l
ds
Mo
v
e 'unpack_trees()' over
t
o 'trav
e
rs
e
_trees()' int
e
rface
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Lin
u
s T
o
rvalds
Make 'traverse_t
r
e
es()'
t
ra
v
erse co
n
flicting DF entries
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
Add return value
t
o '
t
r
a
verse_tree()' callb
a
ck
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
L
i
nus Torvalds
Make 'travers
e
_tree()' us
e
li
n
ked st
r
ucture rat
h
er
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Linus To
r
va
l
ds
Add 'df_name_compare()'
helpe
r
f
u
n
ction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Joha
n
nes Schindel
i
n
builtin remote rm: remove symb
o
lic refs, too
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Jeff King
Add a te
s
t
f
or read-tree -u --reset with a D/F c
o
nflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Junio C Ham
a
no
M
erge b
r
anch
'
ph/parseopt'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C
Hamano
Merg
e
br
a
n
ch '
d
p/clea
n
-f
i
x'
commit
|
commitdiff
|
tree
2008-03-09
J
u
nio C
Hamano
Me
r
ge branch 'ml/submodule
-
ad
d
-existing'
commit
|
commitdiff
|
tree
2008-03-09
J
unio C Haman
o
Merge branch 'mr/com
p
a
t-snprintf'
commit
|
commitdiff
|
tree
2008-03-09
Juni
o
C
H
a
mano
M
e
rg
e
branch 'sp/fe
t
ch
-
optim'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hama
n
o
Merge bra
n
ch 'jc/describe-
a
lways'
commit
|
commitdiff
|
tree
2008-03-09
J
u
nio C Hama
n
o
Mer
g
e branch 'j
c
/am'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Ham
a
no
Merge bran
c
h '
c
r/r
e
set-pa
r
se
o
pt
'
commit
|
commitdiff
|
tree
2008-03-09
Juni
o
C Haman
o
M
erge branch 'jn/
g
i
t
web-pick
a
xe
'
commit
|
commitdiff
|
tree
2008-03-09
J
u
nio C H
a
mano
Merge branch 'kb/maint-filter-bran
c
h-disappear'
commit
|
commitdiff
|
tree
2008-03-09
Junio C
Hamano
Merge branch 'maint'
to
s
ync with 1
.
5
.
4
.
4
commit
|
commitdiff
|
tree
2008-03-09
J
u
nio C Hamano
GIT
1
.
5
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Santi Béj
a
r
ide
n
t
.
c:
rewo
r
d err
o
r message when the user
name c
a
nn
o
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Joh
n
Goerzen
Fix dcommit, rebase when rewriteRoot is i
n
use
commit
|
commitdiff
|
tree
2008-03-08
Jun
i
o
C
Hamano
filter-b
r
a
n
ch
:
han
d
le "disa
p
pearing t
r
ee" case c
o
rrectly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-08
Cha
r
les
B
a
iley
merg
e
-to
o
l
docume
n
tation:
desc
r
ibe custom command usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rles Bailey
git-mergetool
docum
e
ntaiton: show toolnames in typewrit
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-08
Adeodato Si
m
ó
Rea
l
ly
m
ake the LF after
reset
in fast-import
opt
i
ona
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-08
Junio C Haman
o
Merge branch
'
aw/mai
n
t-shortlog-blank-lin
e
s'
commit
|
commitdiff
|
tree
2008-03-08
Jun
i
o
C Hamano
Merge branch '
m
h
/maint-
h
t
t
p
-proxy
-
fix'
i
n
t
o
m
a
in
t
commit
|
commitdiff
|
tree
2008-03-08
Ju
n
io C Hamano
M
erge bra
n
ch
'
j
s
/maint-daemon' into ma
i
nt
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merge bra
n
ch
'js/
m
aint-cvsex
p
or
t
'
into maint
commit
|
commitdiff
|
tree
2008-03-08
Junio C
H
amano
M
erge
bran
c
h
'jc/maint-log-
m
er
g
e-left
-
righ
t
'
i
nto m
a
int
commit
|
commitdiff
|
tree
2008-03-08
J
unio
C
H
amano
Merge branc
h
'ew/m
a
int-sv
n
-c
e
rt-fileprovid
e
r' into
.
.
.
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merge
bra
n
ch 'maint
'
commit
|
commitdiff
|
tree
2008-03-08
J
u
nio C Hamano
s
end-emai
l
: --no-s
i
gned-off-
c
c should s
u
ppress 'sob' cc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-08
Junio C Haman
o
Me
r
ge br
a
nch 'js/
r
eflog-dele
t
e'
commit
|
commitdiff
|
tree
2008-03-08
Jun
i
o C Hamano
Merge b
r
anch '
d
c/format-pret
t
y'
commit
|
commitdiff
|
tree
2008-03-08
Junio
C
Hamano
Merge branch 'cb/
m
e
r
g
etool'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
git-cl
e
a
n
: add
t
ests for rela
t
iv
e
p
a
t
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-08
D
m
itry P
o
t
a
pov
g
i
t
-
c
l
ea
n
: c
o
rrect printing relative path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-08
Dmitry P
o
tapov
Make private quo
t
e_path()
i
n
w
t
-s
t
atus
.
c
a
v
aila
b
le
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
Pierre Habouzit
un
q
uote_c_st
y
le: fix off-by-one
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
t
est-lib: fix TERM t
o
du
m
b for test repeat
a
b
i
l
ity
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
U
we
Kleine-König
co
n
f
i
g
.
txt: refer to --uploa
d
-pack an
d
--receive-pa
c
k
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Ham
a
n
o
Merge br
a
nch '
a
r/sgid-
b
sd'
commit
|
commitdiff
|
tree
2008-03-07
Junio
C Hamano
Merge branc
h
'cc/run-command'
commit
|
commitdiff
|
tree
2008-03-07
Junio C Ha
m
a
n
o
Revert part of d089eba (se
t
up:
sanitize absolu
t
e
a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
Junio C
H
amano
R
e
vert part
o
f 1abf
0
9
5
(
g
i
t
-a
d
d: adjus
t
to th
e
get_pathspec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
Re
v
ert p
a
rt
o
f 744dac
d
(builtin-mv: minimum fix to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hama
n
o
g
e
t_pathsp
e
c(): die
w
h
e
n an
o
u
t-of-tre
e
p
a
th is gi
v
en
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-06
Jun
i
o C Ha
m
ano
M
e
rge
b
ranch 'maint' of git://repo
.
o
r
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2008-03-05
Jakub Narebski
g
i
tweb: Fix and simplify pickaxe sear
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Mark Leved
a
hl
git-submodule - Allo
w
add
i
n
g a su
b
module in-
p
l
ace
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Andy Whi
t
croft
short
l
og: take
the first pop
u
lated line of
the descriptio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Michal
R
o
k
os
A
dd comp
a
t/s
n
printf
.
c
for systems that
r
etu
r
n bog
u
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
A
lex Riesen
Do not
u
se GUID on
d
ir i
n
g
i
t init --shared=all on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Chri
s
tian
Couder
run-co
m
mand: Redirect
s
tde
r
r
t
o
a
p
ip
e
before red
i
r
e
cting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Jo
h
annes
S
c
hindelin
remote: fix "update [group
.
.
.
]"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
C
a
rlos Rica
Make b
u
iltin-reset
.
c use parse
_
option
s
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
SZE
D
ER G
á
bor
bash
:
git-branch -d
a
nd -m list
s
only
local b
r
anches
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
SZEDER Gábor
bash: add
git-branch op
t
ions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s Bailey
Add a very basic test
s
cript for gi
t
mergetool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
ai
l
ey
Teach
g
it merge
t
oo
l
to use custom command
s
defined
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
C
harl
e
s Bailey
Changed a
n
i
n
ternal var
i
able of mergetool t
o
support
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Bailey
Tid
y
up git mergetoo
l
's backup file be
h
aviour
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Denis Cheng
log/show/wha
t
changed:
i
n
t
r
oduce f
o
r
m
at
.
pretty configuratio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Denis C
h
eng
s
p
ecify explicit "--pre
t
ty=medium" wi
t
h `git
l
o
g
/sh
o
w
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
D
enis Cheng
whatch
a
nged
d
o
cumen
t
atio
n
:
sh
a
re desc
r
iption of --pretty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
J
unio C Hamano
am: --
r
ebasing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Junio C
Hamano
am: rem
o
ve support for -d
.
dotest
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Jun
i
o
C H
a
mano
am: r
e
a
d
from
t
h
e
ri
g
ht mailbox when s
t
arted f
r
om a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Junio C Ham
a
no
fsck
.
c: fix b
o
gus
"empty tr
e
e" check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Shawn O
.
Pearce
Teach gi
t
-fetch to
e
x
pl
o
i
t server s
i
de automatic tag
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
S
hawn O
.
Pearce
Teach fetc
h
-
pack/upload-pack about --incl
u
de-
t
ag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Shawn
O
.
Pearce
gi
t
-pack-objec
t
s
: Automatically pack
a
nnota
t
ed
ta
g
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next