repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Update draft release notes to 1.8.2
2013-01-28
Junio C Ha
m
ano
Me
r
ge branch 'ss/help-html
p
ath-config-doc'
i
nto
maint
commit
|
commitdiff
|
tree
2013-01-28
J
u
nio C Haman
o
Merg
e
branch 'nd/attr-debu
g
-fix' into maint
commit
|
commitdiff
|
tree
2013-01-28
Jun
i
o C Hamano
M
erge b
r
anch 'ds/completion-silence
-
in-tree-path-
p
robe
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Junio C
Hamano
Merge bra
n
ch 'jn/
m
a
i
nt
-
trim-vim-contrib' into mai
n
t
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Merge bra
n
c
h 'pe
/
do
c
-
email
-
env-is-trumped-by-config
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Junio C
H
amano
M
e
r
ge branc
h
'mk/complete
-
t
csh' into main
t
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Merge branch 'ap/status-i
g
nored-in-ignored-directory
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Junio C Ha
m
an
o
M
erge bra
n
ch
'er/stop
-
r
e
commending-parsecvs' i
n
to maint
commit
|
commitdiff
|
tree
2013-01-28
Jun
i
o C Hamano
Merge branch
'
m
h/ceiling'
i
nto maint
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Merg
e
branch 't
b
/
t0050-maint'
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Merg
e
branch 'dl
/
am-hg-locale
'
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Merge bran
c
h 'jc
/
help'
commit
|
commitdiff
|
tree
2013-01-28
Junio
C
Ha
m
ano
Merge branch 'bc/fix-array-syntax-for-
3
.
0-i
n
-
c
o
mpl
e
tion
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Matt
h
ie
u
Moy
add: warn wh
e
n
-
u
or -A is used without p
a
thspec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
J
o
hn Keeping
g
i
t-remote-testpy: fix path
h
a
s
h
i
ng
o
n Pyt
h
on 3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
John
K
ee
p
in
g
m
ergetool-
-
lib: don't call "exi
t
"
i
n setu
p
_tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
David Agu
i
lar
m
ergetool-
-
l
ib: impro
v
e
sh
o
w_
t
ool_help()
o
utput
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid Aguilar
mergetools/vim: remove r
e
dundant diff c
o
m
m
and
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete
W
y
c
koff
git p4: introdu
c
e gitConfi
g
Bool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyck
o
f
f
git p4: av
o
id shell when calling git
config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
P
ete Wyc
k
o
f
f
gi
t
p4
:
avo
i
d shell when invoking git config -
-
ge
t
-all
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
P
e
te Wyckoff
g
it p4: avoi
d
shel
l
when invoking git rev-list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pet
e
Wyck
o
ff
git p4: avoid shell whe
n
map
p
i
n
g u
s
e
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git
p
4: disable read-only
att
r
ib
u
te b
e
fore d
e
leting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pet
e
W
y
ck
o
ff
git p4
t
est: use test_chmod
for cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p
4
: cygwin p4 cli
e
n
t
does not mark read-only
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wy
c
ko
f
f
git p
4
te
s
t: av
o
id w
i
ldcar
d
* in windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete
W
yckoff
git p4 test: use LineEnd u
n
ix
i
n wi
n
dows t
e
s
ts too
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wy
c
koff
git p4 test: new
l
ine handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckof
f
gi
t
p4
:
scrub crlf for ut
f
16 files on win
d
ows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p
4
: r
e
move un
r
e
a
chable w
i
ndows
\
r\
n
c
onversion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
g
i
t p4 test: t
r
anslat
e
win
d
ows pat
h
s for cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4 t
e
st:
st
a
rt p4d inside
its db dir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
P
e
te Wyckoff
git p4 test: use cl
i
e
n
t_view in t9
8
06
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
P
e
te
W
yckoff
git
p
4 test:
a
void loop in client_vi
e
w
Based-on-patch-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
P
e
te
W
yckoff
git p4
test
:
use cl
i
e
n
t_view t
o
build the
in
i
tial client
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git
p
4: generate
be
t
ter er
r
or
m
e
s
sage for bad depot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4:
r
emo
v
e
unused imports
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyck
o
ff
git p4: temp branch name should use /
e
ven on wind
o
ws
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Junio C Ham
a
n
o
M
erge
b
ranch 'jk/main
t
-g
c
-auto-after-fet
c
h' into jk
.
.
.
commit
|
commitdiff
|
tree
2013-01-27
Jeff King
fetch-
p
ack: a
v
oid re
p
eat
e
dly re-scanning
pack di
r
ector
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Jeff
Ki
n
g
fe
t
ch
:
run gc
-
-auto after
fetc
h
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Sven Strickrot
h
m
ergetool
s
:
s
upport
Tor
t
oi
s
e
GitMerge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
B
r
and
o
n Casey
git-
p
4
.
p
y:
s
upport Pyt
h
on 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-27
Br
a
ndon Casey
git-p4
.
py: s
u
pport
P
ython 2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-26
Jeff K
i
n
g
logmsg
_
reenco
d
e: lazily l
o
ad missing commi
t
buffers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-26
J
eff King
logmsg_reencode: never
r
e
t
urn
N
ULL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-26
J
e
ff King
c
ommit: drop useless xs
t
r
d
up of com
m
i
t
message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
J
u
n
i
o
C Ha
m
ano
Merge
branch 'for-junio'
of git://bogo
m
ips
.
o
rg/
g
it-svn
commit
|
commitdiff
|
tree
2013-01-25
J
unio C Ham
a
no
Update dr
a
ft release notes
t
o
1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
J
unio C Hamano
Merge
bran
c
h
'
nd/r
e
t
ire-fnmatch'
commit
|
commitdiff
|
tree
2013-01-25
Junio
C
Ha
m
ano
Merge
bra
n
ch 'jc/doc
-
m
a
int
a
iner'
commit
|
commitdiff
|
tree
2013-01-25
Ju
n
io C H
a
mano
h
o
wto/main
t
ain: docume
n
t "### match next" convention
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
g
i
t
-difft
o
ol:
use git-mergetool--lib fo
r
"-
-
t
o
o
l-help"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git-merg
e
to
o
l: don't hardcode 'm
e
rgetool
'
in show_tool_help
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn
K
e
e
ping
git-merget
o
ol: re
m
ove red
u
n
d
ant assig
n
ment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
p
i
ng
git-m
e
rge
t
ool: m
o
v
e
s
how_tool_hel
p
t
o mergetool--lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
Jon
a
than N
i
eder
ident:
d
o not drop usern
a
m
e
when reading from /etc
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
Jun
i
o C Hamano
push: fin
i
shing touc
h
es to
e
xplain REJ
E
CT_ALREADY_EXISTS
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eepin
g
git-remote-testpy: call print
a
s a function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n Keepi
n
g
git-remote-testp
y
: don
'
t do
unbuffe
r
ed text I/O
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n Keeping
git-remote-testpy:
h
ash bytes exp
l
icit
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n
K
eeping
svn-
f
e
:
allo
w
svnrdump
_
si
m
.
py
to run with Pyth
o
n 3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keepin
g
g
it_remote_
h
el
p
ers
:
us
e
2to3 if
b
ui
l
ding with Python 3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Ke
e
p
ing
gi
t
_remote_helpe
r
s:
f
orce
r
ebu
i
ld i
f
pyt
h
on versi
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-24
Junio C
Hamano
t9902
:
protect test from s
t
ray build
a
rtifa
c
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-24
Junio C Hamano
pus
h
: i
n
troduce REJECT_FETC
H
_FIR
S
T and
R
EJECT_NEE
D
S_
F
ORCE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-24
Jun
i
o
C Haman
o
push: furth
e
r simplify the logic to a
s
sign rejecti
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-24
Junio C Hama
n
o
pus
h
: f
u
rther clean up
field
s
of "struct ref"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-24
Alexey Sh
u
mkin
t
7102 (reset): don
'
t hardcode SHA-1 in expected
o
utputs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-24
J
ohn Kee
p
ing
git-cv
s
i
mpor
t
.
txt: cvsps-2
i
s de
p
rec
a
ted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-24
Ju
n
io C Hamano
Me
r
ge
b
ranch
'as
/
pre-push-hook'
commit
|
commitdiff
|
tree
2013-01-24
Junio C
Hama
n
o
Merge
b
ranch
'ch
/
a
dd-aut
o
-submitted-i
n
-s
a
m
p
le-p
o
st
.
.
.
commit
|
commitdiff
|
tree
2013-01-24
J
unio C Ha
m
ano
Merge branch
'as/
c
h
eck
-
ignore'
commit
|
commitdiff
|
tree
2013-01-24
Juni
o
C Ha
m
ano
Merge branch 'rs/clarify-entry-cmp-sslice'
commit
|
commitdiff
|
tree
2013-01-24
J
u
nio C
H
amano
Merg
e
branch '
j
k/suppress-cla
n
g
-warning'
commit
|
commitdiff
|
tree
2013-01-24
Junio C Hamano
Merge bran
c
h 'cr/push-fo
r
ce-
t
ag-update'
commit
|
commitdiff
|
tree
2013-01-24
Jun
i
o C H
a
mano
Merge
b
r
anch 'mh/
i
m
a
p-s
e
nd-shr
i
n
k
ag
e
'
commit
|
commitdiff
|
tree
2013-01-24
Junio C
Hama
n
o
M
erge branch 'mo
/
c
vs-se
r
ver
-
u
p
dates'
commit
|
commitdiff
|
tree
2013-01-24
Jun
i
o
C H
a
mano
Mer
g
e br
a
nc
h
'
j
c/ma
k
efile-p
e
r
l
-python-pa
t
h-doc'
commit
|
commitdiff
|
tree
2013-01-23
J
e
f
f King
r
e
flog:
u
se parse_config
_
key in config
ca
l
lback
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-23
Jeff
K
i
n
g
help: use parse_config_key
fo
r
man c
o
nfig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-23
Jeff
Ki
n
g
submodule: simplif
y
memory ha
n
dling in config parsing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-23
J
e
ff King
submodule
:
use parse_config
_
ke
y
when parsing
con
f
ig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-23
Jeff King
u
s
e
r
diff: drop parse_driver func
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-23
Jeff K
i
n
g
co
n
ver
t
some config
callback
s
to parse_config_key
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-23
Jeff
K
ing
archive-tar:
u
se pa
r
s
e
_config_
k
ey when par
s
ing config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-23
Jeff Kin
g
config: a
d
d helper fun
c
t
ion for parsing ke
y
names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-23
Junio
C
Hamano
M
erge git://ozlabs
.
org/~
p
aul
u
s/gitk
commit
|
commitdiff
|
tree
2013-01-22
Jun
i
o C Hamano
Me
r
ge
b
r
a
nch 'jc/merge-
b
lobs'
commit
|
commitdiff
|
tree
2013-01-22
Ramsay Jone
s
Ma
k
efile: Replace merge-
f
ile
.
h
wit
h
merge-blobs
.
h
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-22
Junio C Hamano
Update draft
release
notes to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-22
Junio C Hamano
Merge br
a
n
c
h 'mz/reset-mis
c
'
commit
|
commitdiff
|
tree
2013-01-22
Junio C H
a
m
ano
Merge br
a
n
c
h 'nd/fix-dir
e
ctory-attrs-off-by-one'
commit
|
commitdiff
|
tree
2013-01-22
Robin Rosenberg
Enable min
i
m
a
l st
a
t
c
hecking
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-22
Juni
o
C Hamano
M
e
rge branch 'pw
/
p
4
-branch
-
fixe
s
'
commit
|
commitdiff
|
tree
2013-01-22
Jun
i
o C Hamano
Merge branch
'm
h
/remot
e
-hg-mo
d
e-bits-f
i
x'
commit
|
commitdiff
|
tree
2013-01-22
Jun
i
o C Ha
m
a
n
o
M
e
rge branc
h
'fc/r
e
m
o
t
e
-
hg-fixup-url'
commit
|
commitdiff
|
tree
2013-01-22
Junio C
H
amano
M
erge branch 'zk/clean-
r
epor
t
-fa
i
lure'
commit
|
commitdiff
|
tree
2013-01-22
Junio C Hamano
Merg
e
branch 'ph/rebase-preserve-a
l
l-
m
er
g
es'
commit
|
commitdiff
|
tree
next