repo.or.cz
/
git
/
mingw.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 Bailey
merg
e
tool: Ad
d
prom
p
t to conti
n
ue
a
fte
r
failing to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arles Bailey
Add -y/--no-
p
r
ompt option to mergetool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-15
Charle
s
Bail
e
y
Fix s
o
me tab
/
space i
n
consistencies in g
i
t
-mergeto
o
l
.
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-14
Jun
i
o C
H
am
a
no
Merg
e
g
it://git
.
b
ogomips
.
o
rg/git
-
svn
commit
|
commitdiff
|
tree
2008-11-14
Junio C Ham
a
no
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2008-11-13
Linus To
r
valds
date
/
time:
d
o not get confu
s
e
d
by fra
c
t
i
o
n
al
seconds
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-13
Juni
o
C Hamano
Merge git:
/
/
git
.
k
e
rn
e
l
.
org/pub/s
c
m/gitk/gitk
commit
|
commitdiff
|
tree
2008-11-13
Junio C Ha
m
an
o
Updat
e
draft
release
notes to 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-13
Junio
C
Ha
m
ano
M
erg
e
branch
'
jn/gi
t
web-customlinks
'
commit
|
commitdiff
|
tree
2008-11-13
Ju
n
io C Haman
o
Merg
e
br
a
nch 'gb/gitweb-sna
p
shot-pat
h
info'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Haman
o
Merge branch 'd
s
/uintma
x
-config' (e
a
rly part)
commit
|
commitdiff
|
tree
2008-11-13
Jun
i
o
C Ha
m
ano
Merge branch 'jk/mai
n
t-
c
o
mmit-v-str
i
p'
commit
|
commitdiff
|
tree
2008-11-13
J
u
ni
o
C
Ham
a
no
Merge branch
'np/pack-s
a
fer'
commit
|
commitdiff
|
tree
2008-11-13
Junio C
H
amano
Merge bra
n
ch 'mk/main
t
-cg-push'
commit
|
commitdiff
|
tree
2008-11-13
Ju
n
io C Hamano
Merge branch
'
b
c/ma
i
nt-keep-pack'
commit
|
commitdiff
|
tree
2008-11-13
Junio
C
Hamano
Mer
g
e branch 'mv/remote-rename'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hama
n
o
Merge
br
a
nch 'jk/deny-push-to-current'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Merge branch 'dl/xdiff'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Ham
a
no
Merg
e
b
r
an
c
h
'lt/dec
o
r
a
te'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Merge branch
'jk/diff-convfilt
e
r'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Merge branch 'jk/di
f
f-convfil
t
er-test-fix
'
commit
|
commitdiff
|
tree
2008-11-13
Jun
i
o C Hamano
M
e
r
ge
b
r
anc
h
's
t
/
t
a
g
'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Mer
g
e
g
it://repo
.
or
.
cz/gi
t
-gui
commit
|
commitdiff
|
tree
2008-11-13
Brandon Casey
t
7
700: test that
'
r
epack -a' pa
c
ks al
t
ernate packed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Juni
o
C Ha
m
ano
git
.
html: Up
d
ate
the links to s
t
ale v
e
rsions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Junio
C Ha
m
ano
Merge
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-11-12
Junio
C Hamano
Start 1
.
6
.
0
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Nic
o
las
P
itre
F
i
x pac
k
.
packSizeLimit and --
m
a
x-pack-siz
e
handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
S
anti Béjar
r
ev-l
i
s
t d
o
c
umentation: clari
f
y the two
p
a
rts of history
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Na
n
ako Shirais
h
i
Document "git
lo
g
--simplify-by-decoration"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
J
uni
o
C Ha
m
ano
checkout
:
Fix "initial ch
e
ck
o
ut" detection
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Jeff King
c
o
mmit: Fix stripping of patch in
v
erbose mod
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Matt Kraai
Remove the period after the git-check-attr
summary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Brandon
C
ase
y
pack-o
b
jects: exten
d
--
l
o
c
a
l
t
o
mea
n
ignore n
o
n-lo
c
al
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Brando
n
Casey
s
h
a1
_
file
.
c:
s
plit has_loose_object() in
t
o local and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Brandon Casey
t7
7
0
0
: demonstrate
mishand
l
ing of lo
o
se
o
bj
e
c
ts in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Br
a
ndon
C
a
s
ey
bu
i
l
tin
-
gc
.
c: use new pack_keep bitf
i
eld to detect
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
B
randon Casey
repack:
d
o
not fall b
a
c
k
to increm
e
nt
a
l repack
i
ng wi
t
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Brandon Casey
rep
a
ck
:
do
n
't re
p
ack local objects in
p
a
cks with
.
keep
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Brand
o
n Casey
pack-objects:
n
ew
opti
o
n --honor-pack-ke
e
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
B
r
andon Casey
packed_git: convert pack_lo
c
al fl
a
g into
a
b
i
tfi
e
ld
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
B
randon
Casey
t7
7
00:
d
e
mon
s
trat
e
mish
a
ndli
n
g o
f
o
bje
c
ts in pa
c
k
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Va
j
na
gi
t
-remote: d
o
cumen
t
the m
i
gration featur
e
of the rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Miklos
V
ajna
git-remo
t
e ren
a
me: migr
a
t
e
f
rom remo
t
es
/
and bra
n
ches/
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-11
Martin Koegler
git p
u
sh: I
n
terpret $G
I
T_D
I
R/branc
h
e
s in a Cogito com
p
a
tible way
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-11
Da
v
id Symonds
gi
t
-dif
f
:
Add --staged as
a
s
y
nonym for --cached
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-11
John Chapman
git-p4: Cache gi
t
c
onfig for performanc
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-11
John Cha
p
man
git-p4
:
S
upport purged files and opti
m
ize memory usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-11
Daniel Lowe
Fix non-literal format in
p
ri
n
tf-style
c
a
lls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-11
Junio C Hamano
M
e
r
ge branch
'
m
a
in
t
'
commit
|
commitdiff
|
tree
2008-11-11
Daniel Lowe
F
i
x non-literal for
m
at in
p
rint
f
-style calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-11
Miklos Vajna
remote
:
add a new 'origin' v
a
riable to the
st
r
uct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-11
Al
e
xandre Julliard
g
i
t
-
s
u
bmod
u
le: Avoid pri
n
ting
a
spurious messa
g
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-11
S
tefan
N
aewe
git
ls-remote: ma
k
e
usage string mat
c
h manpage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-11
Junio C Ha
m
ano
Makef
i
le: help people who
r
u
n
'make
c
h
eck' by mistak
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-11
N
a
nako Shiraishi
Document "git log
-
-source"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-09
Junio C Ham
a
no
t53
0
3: fix printf for
m
at string for portability
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-09
J
u
nio C Ha
m
ano
t5303: wor
k
around printf breakage in dash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-09
David M
.
Syzdek
A
dd autoco
n
f tests
f
o
r
pthreads
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-09
J
unio C
H
ama
n
o
Merge branch
'main
t
'
commit
|
commitdiff
|
tree
2008-11-09
C
h
r
isti
a
n Couder
b
isect:
fix missing "exit"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-09
Christ
i
an
Couder
Documenta
t
ion:
bis
e
ct: cha
n
ge a f
e
w in
s
tances o
f
"git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-09
Christ
i
an Couder
Documentati
o
n:
r
e
v-list: change a f
e
w inst
a
nc
e
s of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-09
J
e
ff Kin
g
r
e
ceiv
e
-pack: dete
c
t push to current branch of
n
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-09
Jeff Ki
n
g
t
5516: refac
t
o
r
oddb
a
l
l
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-09
Alexandre Jul
l
ia
r
d
c
heckout: Don't cra
s
h when switching away from a
n
in
v
alid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-09
Junio C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-11-09
Junio C H
a
mano
GIT
1
.
6
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-09
Quy Tonthat
Update RPM spec f
o
r the new loca
t
ion of
git-cvs
s
e
r
ver
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-09
Junio
C
Hamano
M
e
rge
branc
h
'
c
b/maint-update-ref-
f
i
x
'
into maint
commit
|
commitdiff
|
tree
2008-11-09
Ju
n
io C
H
ama
n
o
Merge branch 'c
j
/maint-gitpm-
f
ix
-
maybe-self' into ma
i
n
t
commit
|
commitdiff
|
tree
2008-11-09
Juni
o
C
H
a
mano
Merge
b
ranch
'ar/maint-
m
ksnpath' into maint
commit
|
commitdiff
|
tree
2008-11-09
Junio C Hamano
Merg
e
branch 'mv/maint-bran
c
h-m-
s
ymref' into
m
aint
commit
|
commitdiff
|
tree
2008-11-09
Junio C Hamano
Merge branch 'ds/auto
c
onf'
commit
|
commitdiff
|
tree
2008-11-09
Junio C Hamano
Merge bran
c
h 'rs/blame'
commit
|
commitdiff
|
tree
2008-11-09
Jeff
K
i
n
g
t5400: expe
c
t su
c
c
ess for denyi
n
g
d
e
letion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-08
D
a
vide Libe
n
zi
xdi
f
f
:
g
ive up scanning simil
a
r lines ea
r
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-07
A
l
exand
e
r
G
a
vril
o
v
gitweb: Fix
mod
_
perl support
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-07
A
lexander Gavrilov
gitweb: Add a per-repository a
u
t
hor
i
z
ation
h
ook
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-07
Alexander G
a
vrilov
gitweb:
U
se s
i
ngl
e
i
m
plementation o
f
export_o
k
check
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-06
Alex
a
nder Gavri
l
ov
Windows:
Make
O
penSSH pro
p
erly d
e
te
c
t tty detac
h
ment
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-05
Clemens Buchac
h
er
push: f
i
x
local refs update
if already up-to-dat
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-05
C
lemens
Buc
h
a
cher
d
o
not force write of packed refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-05
Miklos V
a
jna
Impl
e
ment g
i
t remo
t
e rename
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-05
Juni
o
C Hamano
U
pdate draft r
e
lease note
s
to 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-05
J
u
nio C Hamano
Merge branch '
a
r/mksnpath'
commit
|
commitdiff
|
tree
2008-11-05
Jun
i
o
C
Hamano
Merge branch 'jc
/
gitwe
b
-
fix-cloud-tag
'
commit
|
commitdiff
|
tree
2008-11-05
Junio C Ha
m
ano
M
erg
e
branch
'm
v
/maint-br
a
n
ch-m-symref'
commit
|
commitdiff
|
tree
2008-11-05
Junio
C
Hamano
Merge branch 'mv
/
parseopt-checkout-index'
commit
|
commitdiff
|
tree
2008-11-04
Sam
u
el Tardieu
t
a
g: A
d
d
m
or
e
tests abo
u
t
mixing i
n
compatible modes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-04
Samuel Tardi
e
u
tag: Check
t
ha
t
options
are only
allowe
d
in
the
appropriate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-04
J
unio C Hamano
M
erge branch 'main
t
'
commit
|
commitdiff
|
tree
2008-11-04
Pete Harla
n
contri
b
/hooks/po
s
t-re
c
ei
v
e-email
:
Make revision
display
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-04
Pete Harlan
contrib/hooks/p
o
st-receive-email
:
P
ut
r
ev display in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-04
Linus
Torvalds
r
evis
i
on traversa
l
: '--simplify
-
by-deco
r
at
i
on'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-04
L
inus Torvalds
Mak
e
'
-
-decorate
'
s
e
t
an ex
p
licit
'sh
o
w_decorati
o
ns
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-04
Linus Torv
a
lds
r
evis
i
o
n: make
t
ree compari
s
on functions
take commi
t
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-04
Linus Torvalds
Add
a 'source' decorator for commits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-03
M
a
r
k
us Heidelberg
Ma
k
efile:
a
dd install-man rules (qui
c
k and norm
a
l)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-03
Junio C Hamano
fo
r
mat-patch documentat
i
on
:
ment
i
o
n t
h
e sp
e
cial cas
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next