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
Merge branch 'maint'
2008-03-14
J
unio C Hamano
Merge branch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2008-03-14
Junio C
H
ama
n
o
Merge branch 'ph/m
a
int-q
u
iltimpo
r
t' into
ma
i
nt
commit
|
commitdiff
|
tree
2008-03-14
Junio C
H
aman
o
read-tree() and unpack_trees(): use consistent l
i
m
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-14
Johannes Sc
h
indelin
merge-file: handle empty files grace
f
ull
y
commit
|
commitdiff
|
tree
2008-03-14
Clemens
B
uchacher
me
r
ge-recursive: handle
file mod
e
c
h
anges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-14
Nicolas Pitr
e
pack-objects: proper
p
ack
time stamping wi
t
h -
-
max
.
.
.
commit
|
commitdiff
|
tree
2008-03-14
Vineet
K
umar
M
inor wor
d
ing c
h
anges i
n
the keybo
a
rd
descri
p
tions
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-13
Joha
n
nes
S
chindelin
gi
t
fetch: T
a
k
e
'-n' to m
e
an
'
--no-
t
ags
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-13
J
u
nio C Hamano
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2008-03-13
Johan
n
es Sch
i
n
d
e
l
in
gc
:
call "prune --ex
p
i
r
e 2
.
w
eeks
.
ago
"
by de
f
ault
commit
|
commitdiff
|
tree
2008-03-13
J
u
nio C Hamano
Documentation
/
config: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-13
Jun
i
o C Hamano
quilt
i
m
port: fix misquotin
g
of par
s
e
d -p<num> parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-13
Marc-Andre Lu
r
eau
g
i
t-c
v
simport: fix m
e
r
ging with re
m
ote parent branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-12
Jakub
N
arebski
gi
t
web
:
Fix
b
u
g in hre
f
(
.
.
.
,
-replay=
>
1) w
h
en using
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-12
Junio C Hamano
Mer
g
e g
i
t
:
/
/repo
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-03-12
Junio C Hamano
Me
r
ge bran
c
h 'js/remote'
commit
|
commitdiff
|
tree
2008-03-12
Ju
n
io C Hamano
Merge b
r
anch 'lt/unpack-t
r
e
es'
commit
|
commitdiff
|
tree
2008-03-12
S
a
muel Tardie
u
"rem
o
te update": print remot
e
n
ame being fetched from
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-12
Jun
i
o C Hamano
Merge
b
ra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-03-12
Marc-Andre Lurea
u
git
-
s
v
n
:
fix find
-
rev
e
r
r
o
r message when mi
s
si
n
g arg
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-12
J
eff King
t
0021
:
t
r portability fi
x
for Sola
r
i
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-12
Johannes Sc
h
indelin
launch_editor(): al
l
ow
spac
e
s
i
n the file
n
ame
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-12
Mike
Hommey
g
i
t rebase --abo
r
t: always resto
r
e the r
i
ght commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-11
J
u
nio C
H
amano
Merge bra
n
ch 'jc/cherry-pic
k
' (e
a
rly part)
commit
|
commitdiff
|
tree
2008-03-11
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-03-11
Junio C Hamano
Merge branch 'kb/maint-filter-branch-disa
p
p
ear
'
into
.
.
.
commit
|
commitdiff
|
tree
2008-03-11
Jun
i
o C Hamano
Merge branch '
a
w/maint-short
l
og-blank-lines'
i
n
to main
t
commit
|
commitdiff
|
tree
2008-03-11
Linus Torva
l
ds
u
n
p
a
ck_trees(): f
i
x diff-
i
ndex regr
e
s
s
io
n
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-11
SZE
D
ER
Gábor
upda
t
e 'git rebase' doc
u
mentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-10
J
u
ni
o
C Hamano
t
r
averse_tr
e
es_recursive(): propagate merge
erro
r
s up
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-10
Junio C Hamano
git-pull d
o
cumen
t
ation: wa
r
n about the opt
i
on order
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-10
Pier
r
e
Habouzit
g
i
t
-
quiltimpor
t
: better parser to g
r
o
k
"enhanced" series
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torva
l
ds
unpack_trees(): minor
m
e
mory leak fi
x
in unused destination
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
Make 'unpack_trees()' h
a
v
e
a
s
e
para
t
e s
o
u
r
ce a
n
d destination
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
Make 'u
n
pack_tr
e
es()' take
t
he
index t
o
w
o
rk on as
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Linu
s
Torva
l
ds
Add
'const' where appropriate to index
h
andlin
g
functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Linus T
o
rvalds
Fix tree-
w
alking compare
_
en
t
ry() in the p
r
esense of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Linu
s
Torvald
s
M
o
ve 'unpack_t
r
ees(
)
' ov
e
r to 'traver
s
e
_trees(
)
'
i
nterfa
c
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Linu
s
Torvalds
Make 'traverse_trees()' traverse conflicting DF entri
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
L
i
nus Torvalds
Add r
e
turn value to 'tr
a
verse_
t
r
e
e()' call
b
ack
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Linu
s
Tor
v
alds
Mak
e
'traverse_tree()'
u
s
e linked struc
t
ure
rather
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Linu
s
Torvald
s
Add 'df_
n
ame
_
c
ompare(
)
'
helper func
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Joha
n
n
es Schi
n
de
l
in
builtin remote rm
:
remove symbolic refs, too
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Jeff
King
Add a test for read-tree -u --reset with a
D/
F
confli
c
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Junio C
Hamano
Merge bra
n
ch 'ph/parseopt'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C Hamano
Me
r
g
e
branch 'dp/clean-fix'
commit
|
commitdiff
|
tree
2008-03-09
Jun
i
o C Hamano
M
e
rge branch
'
m
l/su
b
module-add-existing'
commit
|
commitdiff
|
tree
2008-03-09
J
u
nio
C
Haman
o
Merge bran
c
h 'mr/compat-
s
n
p
r
int
f
'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Ha
m
an
o
Me
r
ge branch 'sp
/
fetch-op
t
im'
commit
|
commitdiff
|
tree
2008-03-09
J
un
i
o
C
Hama
n
o
Merge br
a
n
c
h 'jc/describe-always'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Ha
m
an
o
Merge
b
r
anch 'jc/am'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge branch '
c
r
/
r
e
set-pars
e
o
p
t
'
commit
|
commitdiff
|
tree
2008-03-09
Junio C
H
aman
o
Merge
branch 'jn/gitwe
b
-pickaxe'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge bran
c
h 'kb/maint-filter-
b
ranc
h
-disapp
e
ar'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Ha
m
an
o
M
e
rge branch 'm
a
i
nt'
to sync
with
1
.
5
.
4
.
4
commit
|
commitdiff
|
tree
2008-03-09
J
unio C Hamano
GIT 1
.
5
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Sa
n
t
i B
é
ja
r
ident
.
c: re
w
ord error mes
s
age
when the user
n
a
me canno
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
John
Goerzen
F
i
x
dcommit,
r
eb
a
se when rewriteRoo
t
is i
n
use
commit
|
commitdiff
|
tree
2008-03-08
J
u
nio C Hama
n
o
filter-branch:
h
an
d
l
e "dis
a
ppearing tre
e
" case corr
e
ctly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
mer
g
e-tool docum
e
ntation: descri
b
e custom comman
d
usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-08
C
harles Bailey
gi
t
-merg
e
t
ool documentaiton: sho
w
tool
n
ames in typewriter
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-08
Adeodato
S
imó
Really make the LF after reset
in fast-import optional
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-08
Ju
n
i
o C Hamano
Merge branch 'aw/maint-s
h
ortlo
g
-b
l
an
k
-lines'
commit
|
commitdiff
|
tree
2008-03-08
J
u
nio C Hamano
Merge
branch 'mh/maint-http-proxy
-
fix'
into
maint
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merge b
r
an
c
h
'js
/
main
t
-
d
aemon' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2008-03-08
Junio C Ham
a
no
Merge branch 'js/maint-
c
v
s
export' into maint
commit
|
commitdiff
|
tree
2008-03-08
Junio
C Hamano
M
erge bra
n
ch
'jc/maint-lo
g
-merge-l
e
f
t-right' into m
a
int
commit
|
commitdiff
|
tree
2008-03-08
J
unio C Hamano
Me
r
ge branch 'ew/maint-svn
-
cert-f
i
leprovider' into
.
.
.
commit
|
commitdiff
|
tree
2008-03-08
Junio C Ham
a
no
M
e
r
ge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-03-08
Junio C
H
a
mano
send-email
:
--no-signed-o
f
f-cc s
h
ould supp
r
ess 'sob' cc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-08
Junio C
H
amano
M
e
rge branch
'j
s
/reflog-de
l
ete'
commit
|
commitdiff
|
tree
2008-03-08
Ju
n
io C Hamano
Merge
b
ranch 'dc/format-pret
t
y'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Ham
a
no
Merge
b
ranch 'cb/mergetool'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
git-clean:
a
dd tests f
o
r relative p
a
th
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-08
Dmi
t
ry Po
t
apov
git-clean:
c
orrect pr
i
nti
n
g relative path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-08
D
m
itry P
o
tap
o
v
Make private
qu
o
t
e
_path
(
) in wt-stat
u
s
.
c available
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
Pierre Hab
o
uz
i
t
u
n
quo
t
e_c_sty
l
e: fix off-by-one
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
Juni
o
C Hamano
t
e
st-lib: fix TE
R
M to dumb
for test re
p
e
a
tabilit
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
U
we Klein
e
-König
c
onf
i
g
.
txt: refer to -
-
up
l
oad-pack an
d
--receive
-
p
a
ck
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
Merge br
a
nch
'
ar/sgid-bsd'
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
Merge branch 'cc/run-comman
d
'
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
R
e
ve
r
t part of
d
0
89eba (setup:
s
anitize absolute a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
J
uni
o
C
Hamano
Revert
pa
r
t of 1abf0
9
5
(
git-add:
adjust
t
o the
get_
p
athspe
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Ha
m
ano
R
e
vert part of 7
4
4d
a
c
d
(bui
l
tin-mv
:
m
i
ni
m
um f
i
x to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hama
n
o
get_
p
athspec(
)
: die when an ou
t
-of
-
t
re
e
path is giv
e
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-06
Jun
i
o C Ha
m
ano
Merge br
a
nch 'm
a
i
n
t' of
g
it
:
//repo
.
or
.
cz/g
i
t
-gui into
.
.
.
commit
|
commitdiff
|
tree
2008-03-05
J
a
kub Narebski
git
w
eb: Fix and simplify
pickaxe s
e
arc
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
M
a
r
k
Leved
a
hl
g
it
-
s
u
b
m
odule - Allow add
i
ng a s
u
bmodule
i
n-pla
c
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
A
n
d
y Whitc
r
oft
sho
r
t
log:
take
t
he first popula
t
ed
l
ine of the desc
r
i
ption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
M
icha
l
Rokos
Add compat/snp
r
i
ntf
.
c for
s
ystem
s
that return b
o
gus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
A
le
x
R
iesen
Do not use GUID on dir in
g
it ini
t
--shared=a
l
l on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Chris
t
ian Couder
run
-
comm
a
nd: Redirect
s
tderr to
a
pi
p
e before redirecting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
J
o
ha
n
nes Schindelin
remote: fix
"
update [group
.
.
.
]"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Ca
r
los Rica
Make
builtin-reset
.
c use parse_opt
i
o
n
s
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
SZEDER G
á
bor
bash: git-br
a
nch -d and -m lists only local branch
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
SZEDER Gábor
bas
h
: add git-
b
ranc
h
options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bailey
Add a very
b
asic test script for gi
t
mergetool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
ailey
Teach git m
e
rgetoo
l
to use
custom comm
a
n
d
s def
i
ned
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles
Bailey
Changed an in
t
e
r
nal variable of mergetool t
o
supp
o
rt
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
iley
Tidy up
git mergetoo
l
's backup file behaviour
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next