repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mergetool: Add prompt to continue after failing to merge a file
2008-12-13
Char
l
es B
a
il
e
y
m
ergetool: Ad
d
prompt t
o
continue
a
fter failing to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Ad
d
-y/--
n
o-prompt option to mergetool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fix some tab/sp
a
ce inconsistenc
i
es i
n
git-mergetool
.
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-14
J
u
nio C Ha
m
ano
Mer
g
e git://git
.
b
ogomi
p
s
.
o
r
g/git-svn
commit
|
commitdiff
|
tree
2008-11-14
Ju
n
io C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-11-13
Linus T
o
rv
a
ld
s
date/time: do not get
c
onfused
b
y fr
a
ctional seconds
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Me
r
ge
g
it://git
.
kernel
.
or
g
/pub/scm/git
k
/gitk
commit
|
commitdiff
|
tree
2008-11-13
Ju
n
io
C
Haman
o
U
p
date draft release
no
t
e
s
to 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-13
Jun
i
o C Ham
a
no
M
e
r
g
e branch 'jn/gitweb-cus
t
o
m
links
'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Merge branch 'gb
/
gitweb-snapshot-path
i
n
fo'
commit
|
commitdiff
|
tree
2008-11-13
Jun
i
o C
Ham
a
no
Me
r
ge
br
a
nch '
d
s/uintmax-
c
onfig' (early part)
commit
|
commitdiff
|
tree
2008-11-13
Jun
i
o C Hamano
Merge br
a
nch 'j
k
/maint-
c
ommit-v-strip
'
commit
|
commitdiff
|
tree
2008-11-13
Jun
i
o C Hamano
M
e
rg
e
branch 'np/pack-safer'
commit
|
commitdiff
|
tree
2008-11-13
J
unio
C Hamano
Merg
e
branch
'
mk/maint-c
g
-pus
h
'
commit
|
commitdiff
|
tree
2008-11-13
J
u
nio C Hamano
Merge branch 'bc/maint-k
e
ep-pa
c
k'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Ha
m
ano
Me
r
ge branc
h
'mv/remote-rena
m
e'
commit
|
commitdiff
|
tree
2008-11-13
Junio C
H
a
man
o
Merge bra
n
ch 'jk
/
d
e
ny-push-to-current'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Ham
a
no
Merge branch 'dl/xdiff'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Ha
m
ano
Merge b
r
anch 'lt/dec
o
rate'
commit
|
commitdiff
|
tree
2008-11-13
Junio
C
Hamano
Merg
e
branc
h
'
j
k/di
f
f
-con
v
filter'
commit
|
commitdiff
|
tree
2008-11-13
Junio
C
H
amano
Merge bra
n
ch 'jk/dif
f
-convfilter-te
s
t
-
fix'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Ham
a
no
Merge bra
n
ch
'st/tag'
commit
|
commitdiff
|
tree
2008-11-13
Junio C
H
amano
Mer
g
e git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-11-13
Br
a
ndon Case
y
t7700: test that '
r
epack -a' packs altern
a
te packed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Junio C Haman
o
git
.
html: Update
the
l
inks to stale versio
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Junio C Hamano
M
e
rge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-11-12
J
unio C H
a
mano
Start 1
.
6
.
0
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
N
icolas
Pitre
Fix p
a
ck
.
pack
S
izeL
i
mit and --max-p
a
c
k
-siz
e
handling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Santi B
é
j
ar
rev-list documentatio
n
: clarify
th
e
t
w
o parts of
h
istory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Nanako S
h
ira
i
s
h
i
Docum
e
nt
"
gi
t
log
-
-simplify-by-dec
o
ration"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Junio C
Hamano
c
heckout: Fix "initial
chec
k
out"
d
e
t
ection
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Jeff King
com
m
i
t
: Fix stripping of patch in verbose
mode
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Matt Kraa
i
Remove the perio
d
afte
r
the git
-
c
h
e
c
k
-
a
ttr
s
u
mmary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Brando
n
Casey
p
a
ck-obje
c
t
s: extend --loc
a
l to mean
i
gn
o
r
e non-local
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Bran
d
on Casey
sha1
_
fil
e
.
c:
split has_loose_
o
b
ject()
i
nto
l
o
c
a
l a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
B
randon Casey
t7700: demonstrate m
i
shandling
of
loose obje
c
ts in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Brandon Casey
bui
l
tin-
g
c
.
c: use
n
ew pack_keep bitfield to
det
e
ct
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Brandon Casey
re
p
ack: do not fall ba
c
k
t
o
incremental
repa
c
king
w
ith
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Bran
d
on Casey
repack
:
do
n
't rep
a
ck local
o
bjects in packs
w
ith
.
kee
p
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
B
randon
Casey
pack-objects: new opt
i
on --honor-pack-k
e
ep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
B
r
a
nd
o
n Casey
packed_git: convert pack_local flag into a bitfield
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
B
r
andon Casey
t7700:
demonstrate
mishandling
of
o
bje
c
ts in packs
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-remote: document the mig
r
a
t
ion
f
eature of the rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Mi
k
los Vajna
git
-
remote rename: m
i
g
rate fro
m
re
m
otes/
a
nd br
a
nches/
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-11
M
a
rtin Koegler
git push: In
t
erpr
e
t $GIT_DIR/
b
ranches in a
Cog
i
to comp
a
tibl
e
way
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-11
David Sy
m
o
nds
g
it-diff:
A
d
d --staged as a synonym for
-
-ca
c
he
d
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-11
Jo
h
n Chapm
a
n
git-p4: Cache git config
f
or performan
c
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-11
John Chapman
git-p4:
S
u
pport pu
r
ged
f
i
l
es
and
o
pti
m
ize m
e
mory usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-11
Dan
i
el L
o
we
Fix no
n
-literal format in printf-style calls
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-11
Junio C
H
amano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-11-11
D
ani
e
l Lowe
F
ix non
-
l
ite
r
al f
o
rma
t
in pr
i
ntf-style ca
l
ls
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-11
Mik
l
o
s Vajna
r
emote: ad
d
a n
e
w 'origin' variable t
o
the struct
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-11
Alexandre Julliard
g
it-submodu
l
e: A
v
oid
printing a spurious
message
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-11
Stefan Naewe
git ls-remote: m
a
ke usage string match manpage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-11
Juni
o
C Hamano
M
a
ke
f
ile: help people
w
ho
r
un 'ma
k
e check' by mi
s
take
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-11
Nanako
S
h
i
raishi
Docume
n
t
"
git l
o
g
--
s
o
u
rc
e
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-09
Junio C Hamano
t5303: fix printf
forma
t
string
f
or po
r
t
a
bility
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-09
Junio C Ham
a
no
t
5303: work around printf breakage in dash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-09
David M
.
Syz
d
ek
Add autoconf tests f
o
r pthreads
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-09
Junio
C
H
a
mano
Merge b
r
anch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-11-09
Christian Couder
bisect: fix missing "ex
i
t"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-09
C
hristian C
o
ud
e
r
Do
c
umentatio
n
: bisect: change a few
instances o
f
"git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-09
Christian Couder
Docume
n
tation: rev-list:
change
a few ins
t
a
nces of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-09
J
eff
K
ing
r
e
ceive
-
pac
k
:
d
e
t
ect pu
s
h to c
u
r
r
ent b
r
anch of non
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-09
Jeff King
t55
1
6: refac
t
or oddball t
e
sts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-09
Ale
x
and
r
e
Julliard
checkout: Don't
crash when sw
i
tching away fr
o
m an invalid
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-09
J
u
nio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-11-09
J
u
nio C H
a
mano
G
IT 1
.
6
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-09
Quy Tont
h
a
t
Up
d
ate RPM spe
c
for the new location of git-
c
vss
e
rver
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-09
Jun
i
o
C Hamano
M
e
rge branch 'cb/maint-update-ref-fix
'
into
maint
commit
|
commitdiff
|
tree
2008-11-09
Junio C Hamano
M
e
r
g
e branch 'cj/maint-gitpm-fix-m
a
ybe-self'
into maint
commit
|
commitdiff
|
tree
2008-11-09
Juni
o
C
H
amano
Merge
b
r
a
nch 'ar/mai
n
t-mksnp
a
th' into
m
aint
commit
|
commitdiff
|
tree
2008-11-09
Juni
o
C
H
a
mano
Me
r
ge
branch
'm
v
/ma
i
n
t-
b
ranch-m-sy
m
re
f
' into maint
commit
|
commitdiff
|
tree
2008-11-09
Ju
n
io C Hamano
Merge br
a
n
c
h
'ds
/
aut
o
conf'
commit
|
commitdiff
|
tree
2008-11-09
Junio C Hamano
Mer
g
e branch 'rs/bla
m
e'
commit
|
commitdiff
|
tree
2008-11-09
Jeff King
t5400: expect succ
e
ss f
o
r
den
y
ing deletion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-08
Davide Lib
e
nz
i
xdiff:
give up sc
a
n
ning similar
li
n
es early
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-07
Al
e
xan
d
er Gavrilov
gitweb: Fix mod_perl s
u
pport
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-07
A
l
e
xander Gav
r
ilov
gitweb:
Add a per-r
e
pos
i
tory authorization hook
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-07
A
l
e
xander
G
a
vr
i
lov
gitweb: Use single impleme
n
ta
t
ion of
export_
o
k check
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-06
Ale
x
an
d
er Gavri
l
ov
Wind
o
ws: Make OpenS
S
H properly
dete
c
t tty
detachm
e
nt
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-05
Cleme
n
s
B
uc
h
acher
p
u
sh: fix l
o
cal refs update
i
f alr
e
ady
up-to-date
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-05
Clemens Buchacher
do not force write of packed refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajna
I
m
plemen
t
git re
m
ote rename
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-05
J
un
i
o
C
H
amano
Update draft r
e
lease notes to 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-05
Jun
i
o C Hamano
Merge branch
'
a
r/m
k
snpath'
commit
|
commitdiff
|
tree
2008-11-05
Junio C Hamano
Merge
br
a
nch 'jc/gitweb
-
f
i
x-cloud-tag'
commit
|
commitdiff
|
tree
2008-11-05
Juni
o
C Hamano
Merge branch '
m
v/m
a
int-br
a
nch-m-symref'
commit
|
commitdiff
|
tree
2008-11-05
Junio
C Hamano
M
e
rge branch '
m
v
/parseopt-chec
k
out-index'
commit
|
commitdiff
|
tree
2008-11-04
Samuel Tardieu
tag: Add
m
ore te
s
ts about
m
ixi
n
g incompatible
modes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-04
Samuel Tardieu
tag: Check that o
p
tions are only allowed in t
h
e appropria
t
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-04
Junio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2008-11-04
Pete Har
l
a
n
con
t
rib/hooks/
p
o
s
t-recei
v
e-email: Make revision display
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-04
Pete Harlan
contri
b
/h
o
oks/post-re
c
eive-emai
l
: Put rev
display in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-04
Linus Torvalds
rev
i
sion traversal:
'--simplify-by-decoration'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-04
Lin
u
s T
o
rvald
s
Make '
-
-decor
a
te' set an ex
p
li
c
i
t
's
h
o
w_d
e
coratio
n
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-04
L
inus To
r
valds
revi
s
ion: make tree
c
omparison functions
take commits
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-04
Linus Torvalds
Add a
'
s
ource' decorator for com
m
its
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-03
M
arkus Heidelbe
r
g
Makefile: add install
-
man r
u
l
e
s (quick and
n
ormal)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-03
J
u
nio
C
H
a
m
a
no
f
ormat-
p
atch
documentation: mention t
h
e s
p
eci
a
l case
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next