repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation/user-manual.txt: use a lowercase "usage:" string
2013-01-30
Junio C Haman
o
g
i
t_remote_helpers: remove GIT-PYTHON-VE
R
SION upo
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-30
Junio C Hamano
INS
T
A
L
L: git-p4 d
o
es not supp
o
rt Python 3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-30
Nguyễn Thái Ngọc Duy
bra
n
ch: mark more strings for transla
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-30
Junio C Hamano
Merge b
r
an
c
h 'nd/edit-branch
-
desc-while-d
e
tach
e
d' into
.
.
.
commit
|
commitdiff
|
tree
2013-01-30
Ngu
y
ễn T
h
ái N
g
ọc Duy
branch: give a
more helpfu
l
m
e
ssage on redundan
t
a
rgum
e
nts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-30
Nguyễn Thái Ngọc Duy
branch: reject -D/-d
without branch name
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-30
Ngu
y
ễn
Thá
i
Ngọc Duy
branch: no detached HEAD che
c
k
w
hen editing ano
t
her
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-30
Junio C Hamano
Merge branch 'rr/minimal
-
stat'
commit
|
commitdiff
|
tree
2013-01-30
Junio C Haman
o
Merge
b
ranc
h
'nd/magic-pat
h
spec-f
r
om-root'
commit
|
commitdiff
|
tree
2013-01-30
Junio C
H
aman
o
Merg
e
b
ranch '
m
aint'
commit
|
commitdiff
|
tree
2013-01-30
Junio C Haman
o
Merge branch 'tb/t0050-maint' into maint
commit
|
commitdiff
|
tree
2013-01-29
David Agui
l
ar
m
e
rgetoo
l
--
l
ib: impro
v
e the help
t
e
x
t in guess_merge_tool()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Agui
l
ar
m
e
r
getool--lib: s
i
mplify
comm
a
nd expr
e
ssions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-29
Junio C Hamano
Merge branch '
n
d
/
f
ix-direct
o
ry
-
attrs-off-by-one' int
o
.
.
.
commit
|
commitdiff
|
tree
2013-01-29
J
u
nio C Ha
m
a
no
Merge branch
'
p
h/rebase-preserve-all-merges' into maint
commit
|
commitdiff
|
tree
2013-01-29
Junio C Hama
n
o
READ
M
E: update stale and/or incorrect information
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-29
Junio C Hamano
upl
o
ad-pack: s
i
mplify request va
l
i
dation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid
Aguilar
m
e
rge
t
ools: s
i
mplify how we
h
andle "vi
m
" and "defaults
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-29
A
ndrej
E
Baranov
g
i
t
w
e
b
:
refer to pi
c
on/gravatar images over the
s
a
me
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
Junio C Ham
a
no
Update draft release note
s
to 1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
Juni
o
C Hama
n
o
Sync with 1
.
8
.
1
.
2
commit
|
commitdiff
|
tree
2013-01-28
Junio C Ha
m
ano
Git 1
.
8
.
1
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
Junio C
H
amano
Merge br
a
nch 'ss/
h
e
lp-html
p
ath-
c
o
nfi
g
-doc' int
o
maint
commit
|
commitdiff
|
tree
2013-01-28
Junio C Ha
m
ano
Merge bran
c
h 'nd/attr-d
e
b
u
g
-fi
x
' i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2013-01-28
Ju
n
io
C
Hamano
Merge
branch 'ds/comp
l
etion-
s
ilen
c
e-in-tree-path-prob
e
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Junio C
H
am
a
no
Me
r
ge branch 'jn/mai
n
t-t
r
im-vim-contrib'
i
nto m
a
int
commit
|
commitdiff
|
tree
2013-01-28
Junio
C Hamano
Merge branc
h
'pe/doc-ema
i
l
-
env-is-trump
e
d-by-config
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Mer
g
e
b
ra
n
c
h
'mk/c
o
m
p
lete-tcsh' into main
t
commit
|
commitdiff
|
tree
2013-01-28
Junio C H
a
mano
Merge branch 'ap/
s
tatus-ignored-in
-
i
g
nored-direc
t
o
ry
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Junio C H
a
mano
Merge
branch '
e
r/stop-r
e
commendin
g
-pa
r
secv
s
' into
maint
commit
|
commitdiff
|
tree
2013-01-28
Junio C Ha
m
ano
Merge bran
c
h
'mh/ce
i
ling' into maint
commit
|
commitdiff
|
tree
2013-01-28
J
unio C H
a
mano
M
erg
e
branch 'tb/t0050-ma
i
nt'
commit
|
commitdiff
|
tree
2013-01-28
J
u
nio
C
Hamano
M
e
rge br
a
nch '
d
l/am-
h
g-loca
l
e'
commit
|
commitdiff
|
tree
2013-01-28
Jun
i
o C H
a
mano
Merge bran
c
h 'jc/help'
commit
|
commitdiff
|
tree
2013-01-28
Junio C
H
a
mano
Merge bran
c
h 'bc/fi
x
-arra
y
-syntax-for-3
.
0
-
in
-
completion
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Matthieu Moy
add: w
a
rn when -u or -A is
used without pat
h
sp
e
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
John K
e
eping
git-rem
o
te-testpy:
fi
x
path hashing on
P
ython
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
Joh
n
K
e
ep
i
ng
mergetool--lib: don't call "exit"
in se
t
up
_
too
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
merget
o
ol--lib: improve show_tool
_
help() out
p
ut
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mergetools/vim: remove redundant diff
c
o
m
mand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckof
f
git p4: introduce gitConfigBool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete
W
yckoff
git p4: avoid shell when calling g
i
t
config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pet
e
Wyck
o
ff
git p
4
: avoid shell when i
n
v
oking git
con
f
ig --get-
a
ll
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete W
y
ckoff
git p4: avoid she
l
l
w
he
n
invoking git
r
ev-list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4: avoid shel
l
when mappin
g
u
s
e
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete
Wyck
o
ff
git p4:
d
i
sable re
a
d-only attribute bef
o
re dele
t
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4 te
s
t: use test_chmod for
c
y
gwi
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
P
ete W
y
cko
f
f
git p4: cy
g
w
in
p
4
clien
t
d
o
es no
t
mark r
e
a
d
-only
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete W
y
ckoff
git p4 test: avoid wildcard
* i
n
windows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
P
e
te Wyckoff
git
p
4 test: use LineEnd unix
i
n
windows tests too
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete
W
ycko
f
f
g
it p4 test: newli
n
e
h
a
n
dl
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete W
y
ckoff
git p4: scrub cr
l
f
for ut
f
16 fil
e
s on windows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wy
c
k
o
ff
git p
4
: r
e
move unreachable wind
o
w
s
\r\n conv
e
rsion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete W
y
c
kof
f
git
p
4 test: translate windows pa
t
hs for cyg
w
in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4 test:
s
tar
t
p4d
inside its
db dir
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete
Wyckoff
git p4 test: us
e
client_view in t9806
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wy
c
koff
g
it p
4
test: avoid
loop in clien
t
_view
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
Pete Wyckof
f
git p
4
test: use client_
v
iew
t
o build the initial clien
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyc
k
off
git p4: g
e
ne
r
ate b
e
tter error message
for bad de
p
o
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pet
e
W
y
c
koff
g
i
t p4: remove unused imports
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wy
c
koff
g
it p4:
temp
br
a
nch name should us
e
/ ev
e
n on w
i
ndows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Junio C Hamano
M
e
r
ge branc
h
'jk
/
maint-gc-auto-
a
ft
e
r-fetch' into jk
.
.
.
commit
|
commitdiff
|
tree
2013-01-27
Jeff
K
ing
fetch-pack: avoi
d
rep
e
ated
l
y r
e
-scanning pack directory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Jeff
K
ing
f
e
tc
h
: run gc -
-
a
u
t
o after fetchin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Sven Strickroth
mer
g
eto
o
ls: support
TortoiseGitMerge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Brandon
C
ase
y
git-p
4
.
p
y
: su
p
port Pytho
n
2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-27
Bran
d
on Case
y
git-p4
.
py:
s
upport Python
2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-26
Je
f
f King
lo
g
ms
g
_reencode: lazil
y
load
m
issing commit buffers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-26
Jeff King
logmsg_reencode: never
r
eturn NULL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-26
Je
f
f King
com
m
it: dr
o
p useless
xstrdup
o
f com
m
it
mess
a
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
J
unio C Ham
a
no
Merge
b
ranch '
f
or-junio' o
f
git:/
/
bogomi
p
s
.
org/git-svn
commit
|
commitdiff
|
tree
2013-01-25
Junio C
H
amano
Update draft rele
a
se notes t
o
1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
J
u
nio C
H
amano
Merge
bran
c
h '
n
d
/
re
t
i
re-f
n
ma
t
ch'
commit
|
commitdiff
|
tree
2013-01-25
Junio C Ham
a
no
Mer
g
e branch 'jc/doc-main
t
ainer'
commit
|
commitdiff
|
tree
2013-01-25
Jun
i
o C Haman
o
howto
/
m
aintain: doc
u
ment "### match next" convention
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t
-
diffto
o
l: use gi
t
-
m
ergetool--lib for "--tool-h
e
lp"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
K
eeping
git-
m
ergetool: do
n
't hardco
d
e 'me
r
getool'
i
n show
_
t
o
o
l_he
l
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git-mergetool: re
m
ove redun
d
ant
a
ssignme
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git-me
r
getool
:
move show_t
o
ol_
h
elp to mergeto
o
l
--lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
Jon
a
than Nied
e
r
iden
t
:
do n
o
t drop use
r
name whe
n
re
a
d
ing from /etc
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
Junio C Hamano
push
:
finishing
t
ouches to exp
l
ai
n
REJECT_ALREADY_EXISTS
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn
K
eeping
git-remo
t
e-
t
est
p
y: call
p
rint as a
f
unction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git-r
e
m
ote-testpy: don't d
o
unbuffered
text I/O
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keep
i
n
g
git
-
remote-testpy: hash bytes explicitly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John
K
ee
p
ing
svn-fe
:
allow
s
v
nrdump_
s
im
.
p
y to run with P
y
t
h
on 3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn
K
eeping
g
i
t
_r
e
mote_helpers: use 2to
3
if
b
uild
i
n
g
with
P
y
th
o
n 3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keep
i
ng
git_remote_helpers: force rebuild if
python v
e
r
s
ion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Jun
i
o C Hamano
t9902: p
r
otect test f
r
om
s
tray build
arti
f
a
c
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Juni
o
C Ha
m
ano
p
ush:
i
ntroduce R
E
JECT_FE
T
CH_FIRST and REJECT_NEE
D
S
_
FORCE
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Ju
n
io C
H
amano
push: fu
r
ther
simplify the logic to a
s
si
g
n rej
e
cti
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
J
u
n
io C Hamano
p
ush:
f
urther clean up fields of "struct ref"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Alexey Shumkin
t7102 (res
e
t):
d
on't hard
c
ode SHA
-
1
in e
x
pected o
u
tputs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
John K
e
eping
git-cvsi
m
p
or
t
.
txt: cvsp
s
-2 is d
e
precated
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-24
Juni
o
C Hamano
Mer
g
e branch 'a
s
/pre
-
push-hook'
commit
|
commitdiff
|
tree
2013-01-24
Junio
C Haman
o
Merg
e
bra
n
ch 'ch/add-auto-submit
t
e
d-in-sample-post
.
.
.
commit
|
commitdiff
|
tree
2013-01-24
Junio C
H
amano
Mer
g
e bra
n
ch 'as/check-ignore'
commit
|
commitdiff
|
tree
2013-01-24
Junio
C
H
amano
M
erge branch 'rs/clarify-entry-cmp-sslice'
commit
|
commitdiff
|
tree
2013-01-24
J
uni
o
C Hamano
Merge branc
h
'
jk/suppress-c
l
ang-warning'
commit
|
commitdiff
|
tree
2013-01-24
J
unio C Ha
m
a
no
Merge branch 'cr
/
p
u
sh-fo
r
ce-tag-update'
commit
|
commitdiff
|
tree
2013-01-24
Junio
C Hamano
Merge branc
h
'mh/imap-send-shrinkage'
commit
|
commitdiff
|
tree
next