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
Ju
n
io C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2008-03-13
Johannes Schindelin
gc
:
call
"
prun
e
-
-
exp
i
re 2
.
w
e
e
k
s
.
ago" by
de
f
ault
commit
|
commitdiff
|
tree
2008-03-13
Junio C
H
amano
Documentat
i
on/c
o
nfi
g
: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Marc-A
n
dre L
u
reau
g
it-cvsimport:
fix me
r
g
ing with remote parent branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Jakub Nare
b
ski
g
itw
e
b
: F
i
x bug in
h
ref(
.
.
.
,
-
replay=>1) when
u
sing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
J
u
n
i
o
C Hamano
Merge git:/
/
repo
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-03-12
Junio C Hamano
M
e
rge branch 'js
/
remote'
commit
|
commitdiff
|
tree
2008-03-12
Junio
C Hamano
M
er
g
e
branch 'lt
/
unpack-trees'
commit
|
commitdiff
|
tree
2008-03-12
Samuel
Tardieu
"r
e
m
o
te update": print remo
t
e name being fetched from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Junio C Hamano
M
e
r
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-03-12
Marc-Andre Lureau
gi
t
-svn:
fix find-re
v
er
r
or message when missing arg
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Jef
f
King
t002
1
: tr porta
b
ilit
y
fix for Solaris
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Johannes Sch
i
nd
e
lin
la
u
nch_e
d
it
o
r
(
)
:
all
o
w spaces in
the file
n
ame
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
M
ike Hommey
git r
e
base --abort: always
r
e
store the right commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-11
Junio C
H
amano
Merge
branch
'jc/cherry-
p
ick' (early part)
commit
|
commitdiff
|
tree
2008-03-11
Ju
n
io C Hamano
Merge bra
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2008-03-11
J
un
i
o C
H
amano
Merge
branch 'kb/
m
aint
-
f
i
l
t
er-branch-disappea
r
' into
.
.
.
commit
|
commitdiff
|
tree
2008-03-11
Junio C Hamano
Merge branch 'aw/mai
n
t-shortl
o
g-bla
n
k-lines
'
into maint
commit
|
commitdiff
|
tree
2008-03-11
L
i
nus Torvalds
unpack_
t
rees(
)
: fi
x
diff-index regress
i
o
n
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-11
SZEDER Gáb
o
r
update 'git rebase' doc
u
m
entat
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-10
J
u
nio C
H
amano
traverse_trees_recursive()
:
propagate merge e
r
rors up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-10
J
unio C Haman
o
git-pull documen
t
ation: warn about
t
he
o
p
tion orde
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
L
i
n
u
s
T
orvald
s
unpack_trees(): minor memory leak fix in unused destinati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvald
s
Make
'unpack_
t
rees()' have a se
p
a
r
ate source and destination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linu
s
T
o
r
v
alds
Make 'unpac
k
_tre
e
s()'
take th
e
in
d
ex to work on a
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
L
i
nu
s
Torv
a
l
d
s
Add 'const' w
h
er
e
appropriate to index
h
andli
n
g f
u
nctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
F
ix tree-wa
l
king compare_ent
r
y() in the presense of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus To
r
valds
Move 'unpa
c
k_trees()'
o
ver
t
o
'tr
a
v
e
r
s
e_trees()'
i
nterface
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Li
n
u
s
Torval
d
s
Make 'tr
a
verse
_
trees(
)
' traverse
c
o
nflicting
D
F entries
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
L
i
nus
To
r
va
l
d
s
Add re
t
urn val
u
e
to
'
traverse_tr
e
e
()' callback
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
L
i
n
u
s Torv
a
lds
Make 'traverse_tree()' u
s
e linked structure rath
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Lin
u
s Torval
d
s
Ad
d
'df_name_compare()' hel
p
er functio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Johannes Schindelin
built
i
n remote rm: remo
v
e s
y
m
bo
l
i
c
refs, too
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Jeff K
i
ng
Ad
d
a
t
est for r
e
ad-
t
ree -u --rese
t
wit
h
a D/F
c
onflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
J
u
nio C Hamano
Merge branch 'ph/parseopt'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Ha
m
a
n
o
Merge b
r
anch 'dp/cle
a
n-f
i
x
'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Ha
m
ano
Merge branch 'ml/su
b
modu
l
e-add-existing'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Ha
m
a
n
o
Merge branch 'mr/compat-snprintf'
commit
|
commitdiff
|
tree
2008-03-09
Junio C H
a
mano
Me
r
ge bran
c
h 'sp/fetch-optim'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merg
e
bra
n
ch
'
jc/descri
b
e
-
always'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
M
e
rge b
r
an
c
h 'jc/am'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge
b
ranch 'c
r
/
r
e
set-p
a
rseopt'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C
H
amano
Mer
g
e branch 'jn/gitw
e
b-pickaxe'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C Hamano
Merge
b
ranch 'kb/mai
n
t-fil
t
er-bra
n
ch-
d
i
s
appear'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C
H
a
m
ano
Merge branch 'maint' to
sync with 1
.
5
.
4
.
4
commit
|
commitdiff
|
tree
2008-03-09
Junio C Ham
a
n
o
G
IT
1
.
5
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Santi Béjar
ide
n
t
.
c: rew
o
rd erro
r
message when t
h
e user name cannot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
John G
o
erzen
Fix dcomm
i
t, rebase when rewriteR
o
o
t
is
i
n use
commit
|
commitdiff
|
tree
2008-03-08
Junio C
Hamano
filter-bra
n
ch: handle "d
i
sappearing tree" case correctly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Charles
B
aile
y
merge-tool documentat
i
on
:
describe custom co
m
mand
u
sage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Cha
r
le
s
Bail
e
y
gi
t
-mergetool documentaiton: show
toolnames
in
typewrit
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Adeoda
t
o Sim
ó
Really mak
e
the LF afte
r
r
e
set
i
n fast-import opt
i
o
nal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
J
unio C Hamano
M
erge branch 'aw
/
maint-s
h
ortlog-blan
k
-lines'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merge
branch 'mh/mai
n
t-http-proxy-fix' in
t
o maint
commit
|
commitdiff
|
tree
2008-03-08
Junio C H
a
mano
Merge branc
h
'js/maint-daemon' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2008-03-08
Junio C Ham
a
no
Me
r
g
e
br
a
n
c
h
'
js/m
a
int-cvsexport'
i
nto maint
commit
|
commitdiff
|
tree
2008-03-08
J
unio C Hamano
M
e
rge branch 'jc
/
m
aint-log-merge-left-right' into maint
commit
|
commitdiff
|
tree
2008-03-08
Jun
i
o C
Hamano
Merge branch
'
e
w
/mai
n
t-svn-c
e
rt-fileprovider' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2008-03-08
Junio C Ha
m
ano
M
erge br
a
nch 'maint
'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
s
e
n
d
-email: -
-
no-signed-off-cc should
s
uppress
'sob' cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Junio C Ham
a
no
Merge
branch 'js
/
ref
l
og-delete'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merg
e
branch
'dc/fo
r
mat-pretty'
commit
|
commitdiff
|
tree
2008-03-08
Junio
C
Hamano
Me
r
ge bra
n
c
h 'cb/merge
t
ool'
commit
|
commitdiff
|
tree
2008-03-08
J
u
nio C
H
amano
gi
t
-clean:
a
dd t
e
sts for
r
e
l
ative
p
a
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Dmit
r
y
P
o
tapov
git-c
l
ean:
c
orrect prin
t
ing rela
t
ive path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Dmitry
P
o
t
ap
o
v
M
ake pri
v
ate
quote_p
a
t
h()
in wt-st
a
tus
.
c availab
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Pierre
H
a
bouzit
u
n
quote_c_style: fix of
f
-by-one
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
J
u
nio C Hamano
test-li
b
: fix TERM to
d
umb for test
repeatabi
l
ity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Uwe
K
leine-König
confi
g
.
txt: refer to --upload-
p
ack and --receive-pack
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hama
n
o
Merge b
r
anch 'ar/sgid-b
s
d
'
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
Merge branch 'cc/run-command
'
commit
|
commitdiff
|
tree
2008-03-07
Ju
n
io C
H
a
m
a
no
R
e
ver
t
par
t
of d089eba (setup
:
sanitize
absolute and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Ham
a
no
R
e
vert part of 1abf095 (git-add
:
adjust to
t
he get_
p
a
t
h
s
pec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
J
unio C Hama
n
o
Revert p
a
rt
o
f
7
44
d
ac
d
(builtin-mv: minimum
f
ix to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
g
et_p
a
thspec(): d
i
e whe
n
an out-of-t
r
e
e
path
i
s giv
e
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-06
Junio C Hama
n
o
Merge br
a
nch 'mai
n
t' of git
:
//repo
.
or
.
cz/git
-
gui in
t
o
.
.
.
commit
|
commitdiff
|
tree
2008-03-05
J
ak
u
b Nareb
s
ki
gitweb: Fix and simplify pickaxe sear
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Mark
Levedahl
g
i
t-submod
u
le - Allow adding a s
u
bmodule in-place
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
And
y
Whitcroft
s
h
ortlog: take the first
p
opulated
l
ine of the d
e
scri
p
ti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Michal Rokos
Add compat/snprin
t
f
.
c for sy
s
tems
that return b
o
g
u
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Alex Ries
e
n
Do
n
ot use GUI
D
on dir
i
n g
i
t in
i
t -
-
sh
a
red=all
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Chr
i
stian Couder
run-command:
Redirect
st
d
err
t
o
a
pipe b
e
f
ore
r
edirecting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Johannes
S
c
hindelin
remote: fix "up
d
ate [group
.
.
.
]
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Carlos
R
ica
M
a
k
e
builtin-res
e
t
.
c
u
se parse_opti
o
ns
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
SZ
E
DER Gáb
o
r
b
a
sh: gi
t
-br
a
nch -d and
-
m
lists on
l
y
local branches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
SZ
E
DER
Gá
b
or
bash:
a
dd git-branch option
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add a very
b
as
i
c test scri
p
t
f
or git me
r
getool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
iley
Teach git mergetool to use custom commands def
i
ned
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bai
l
e
y
Changed a
n
i
nte
r
nal variab
l
e of merge
t
ool to support
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tid
y
up git mergetool's backup fil
e
behaviour
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
De
n
is
C
heng
l
o
g
/
show/whatchanged
:
i
n
t
r
oduce format
.
pretty configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
D
enis Cheng
specify explicit "-
-
pre
t
ty=medium" with `gi
t
l
og/
s
h
o
w
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
D
enis
C
heng
whatc
h
anged document
a
tion:
s
hare de
s
cr
i
ptio
n
of --pretty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Ju
n
io C Hamano
am: --r
e
basing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Junio C Haman
o
a
m
: re
m
ove su
p
p
o
rt for -d
.
dot
e
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
J
uni
o
C Hamano
a
m
: rea
d
f
r
o
m
th
e
right
m
ailbox when started from a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Junio C
Hamano
fsck
.
c: fix
b
ogus "empty tre
e
"
c
heck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Shawn O
.
Pearce
Te
a
ch git-
f
etch to exploit se
r
v
er side a
u
tomatic t
a
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
S
hawn O
.
Pear
c
e
Teach fetch-pack
/
u
pl
o
ad-pack a
b
o
u
t --include-tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Shawn O
.
Pearce
g
i
t-pack-obje
c
ts: Automatically pack a
n
notat
e
d tags
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next