repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'gr/cvsimport-alternative-cvspass-location' into maint
2011-05-13
Junio C Haman
o
Merge branch 'gr/cvsimport-alter
n
at
i
ve-cvspass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
H
amano
Merge bra
n
ch '
c
j/p4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Merge
b
ranch 'jk/merg
e
-one
-
file-working-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge bran
c
h 'jc/fix-di
f
f
-files-unme
r
ged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
a
m
ano
M
e
rge bra
n
c
h
'
mz/maint-ren
a
me-unmer
g
ed' i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t
5
400: Fix a couple of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
oã
o
B
r
i
tt
o
Remov
e
dupl
i
c
a
ted "is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
J
u
nio C H
a
mano
t3701
:
fix he
r
e
d
ocument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Micha
e
l J G
r
u
be
r
git-fast-impor
t
.
txt: --relati
v
e
-m
a
rks tak
e
s
no p
a
rame
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
s
he
l
l: add missing init
i
alization of argv0_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
G
i
t 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
H
amano
Merge
b
ran
c
h
'jh/dirstat' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'sp/m
a
in
t
-c
l
e
a
r
-postfields'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C H
a
m
a
no
Mer
g
e branch 'jk/ma
i
nt-stash-oob' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge bran
c
h 'jk/
m
aint-upl
o
ad-p
a
ck-shallow' into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
i
o
C
H
amano
Merge branch '
d
m/
s
tash-k-i-p' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Merge
branch
'jc/pack-obje
c
ts-bigfile' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Merge
b
ranch 'mg
/
ref
l
og-with-
o
p
tions' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C H
a
mano
Merge bra
n
c
h
'jk/stash-lo
o
sen-safety' i
n
to
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge br
a
nc
h
'a
r
/clean-rmdir
-
empty' into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
M
e
rge branch 'mg/sha
1
-pa
t
h-
a
dvise' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Valen
t
in Haenel
git-add
.
txt: documen
t
'add
.
ignoreErrors'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Ciaran
J
essup
Pass
e
mp
t
y file
t
o p4merge where no
base is s
u
it
a
bl
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Gu
y
R
o
uillier
Look fo
r
password in bo
t
h
CVS and
C
VSNT password files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff
K
i
ng
me
r
ge-one-file: fix broken merges with alte
r
nate work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add
t
e
sts fo
r
merg
e
-index
/
merge
-
one-
f
ile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Start 1
.
7
.
5
.
1 maintenance track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C Haman
o
Merg
e
b
r
anch 'mg/x-years
-
12-months'
i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2011-04-29
Sylvain
R
a
bot
git
-
send-ema
i
l
:
fix mi
s
sing space in
e
r
ro
r
m
ess
a
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Junio C
Hama
n
o
http: clear
POSTF
I
ELDS when
i
n
itializing a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
uni
o
C Hamano
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Haman
o
d
iff-files: show unme
r
g
e
d entries cor
r
ectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
H
am
a
no
diff:
r
emove
o
f
ten unused paramet
e
r
s from diff_
u
nmerge
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Jun
i
o C Ha
m
ano
di
f
f
.
c: ret
u
rn fi
l
ep
a
ir fr
o
m diff_un
m
e
r
ge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
H
amano
test
:
use
$_z40 from test-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
M
ichael J Gruber
date:
a
void
"
X
years
,
12 mon
t
hs" in
r
elativ
e
dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C
H
amano
G
i
t 1
.
7
.
5-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Sync with 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hama
n
o
Git 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Michael J Gruber
gi
t
-svn
.
txt: Doc
u
ment
-
-
merg
e
info
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Hamano
Reve
r
t "r
u
n-command: prettify -D
_
FORTI
F
Y_S
O
UR
C
E workaround"
commit
|
commitdiff
|
tree
2011-04-14
Junio C Ha
m
ano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2011-04-14
R
ené Scharfe
archive:
d
ocument
limitation o
f
t
ar
.
umask
config
s
e
tting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Mi
c
hae
l
J
Gruber
t3306,t5304: avoid
c
l
ock
s
kew issue
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gruber
g
i
t
.
txt: fix list c
o
n
t
i
nuation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Jun
i
o C Ham
a
n
o
Git
1
.
7
.
5-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Juni
o
C Hamano
Mer
g
e branch
'
maint'
commit
|
commitdiff
|
tree
2011-04-13
Jun
i
o C
H
ama
n
o
Merge
b
ranch 'jc/re
v
-list-options-fix
'
into maint
commit
|
commitdiff
|
tree
2011-04-13
J
u
n
io C Hamano
Merg
e
br
a
nch 'js/che
c
k
out-unt
r
acked-symlink
'
into main
t
commit
|
commitdiff
|
tree
2011-04-13
Jim Meyering
remov
e
doub
l
ed w
o
rds, e
.
g
.
, s/
t
o to/to/, an
d
fix
r
elated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ram
k
um
a
r
Ramacha
n
dra
r
e
v
ert: Hi
d
e '-r'
o
ption
in default
u
sage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
J
o
han Herl
a
nd
--dirstat
:
In case of renames,
use target
f
ilename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Junio
C
Hamano
Mer
g
e
b
ra
n
ch '
j
s/check
o
ut-untracked-symlink'
commit
|
commitdiff
|
tree
2011-04-12
Ju
n
io C Hamano
Me
r
g
e bra
n
ch 'nd/i
n
it-gitd
i
r'
commit
|
commitdiff
|
tree
2011-04-12
Johannes Si
x
t
t2021:
m
ark a test as fix
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Jo
h
a
nnes Sixt
t0
0
01: guard a
n
ew test w
i
th SYMLINKS prerequis
i
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Te
a
ch --dirstat not to completely ignore rearranged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Æv
a
r
Arnfjörð Bjar
m
ason
Makefile:
extra
c
t Q_() source stri
n
gs
a
s nge
t
text()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ra
m
sa
y
Jones
i
1
8n: avoid parenthe
s
ized s
t
rin
g
a
s
arr
a
y initializer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
erland
--dirst
a
t-by-
f
ile: Make i
t
f
aster
a
nd mor
e
c
orrect
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
e
rland
--dirstat: Des
c
r
ibe n
o
n-obvious differences rela
t
ive
.
.
.
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
J
unio C Hamano
Merge git://git
.
b
ogom
i
ps
.
or
g
/git-svn
commit
|
commitdiff
|
tree
2011-04-11
J
u
nio C Ham
a
n
o
M
erge
gi
t
:
//git
.
kernel
.
or
g
/pub/s
c
m/
g
i
t
k/gitk
commit
|
commitdiff
|
tree
2011-04-07
Da
n
McGee
st
a
sh
:
ensure --no-keep-index and --patch can b
e
used
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Dan McGee
s
tash: add two more tests for
--
n
o-keep-index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
A
n
drew Garber
g
it-p4: repl
a
ce e
a
c
h tab with 8 spaces for consistency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
J
e
ff
K
ing
upload-pack: start pack-ob
j
ec
t
s before async rev-list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
J
u
nio C Hamano
G
it
1
.
7
.
5-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Sync with 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ham
a
no
Git
1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ham
a
no
Merge branch 'nm/maint
-
conflicted-su
b
m
o
dule
-
en
t
ries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Junio C
Hama
n
o
Merge branch 'm
g
/rev-
l
ist
-
n-reverse-doc'
i
n
to maint
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o C
Hamano
M
e
rg
e
branch 'jk/maint-remote-mi
r
ror-safer'
commit
|
commitdiff
|
tree
2011-04-06
Junio C Haman
o
Merge branch
'mg/doc-r
e
visions-tx
t
'
commit
|
commitdiff
|
tree
2011-04-06
J
eff
K
ing
stash: drop d
i
rty
wor
k
tree check on
a
pply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
J
u
nio
C
H
amano
Te
a
c
h
c
o
re
.
b
i
gfile
t
h
r
e
a
shold to pack-objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jon Seymour
stash: fix
false
po
s
itive i
n
the invali
d
r
ef test
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash
:
fix acci
d
en
t
a
l
apply of non-ex
i
s
tent sta
s
hes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Mic
h
ael J Gruber
revisio
n
s
.
txt: la
n
gu
a
ge
i
mprovements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
J
unio C Hamano
M
e
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2011-04-04
Junio C
Hamano
Merg
e
bran
c
h 'jl/subm
o
d
u
le-fetch-on-demand
'
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hama
n
o
Merge branch 'jc/r
e
v-list-optio
n
s-fix'
commit
|
commitdiff
|
tree
2011-04-04
S
Z
EDER Gábor
Do
c
u
men
t
ation:
trivial gr
a
m
mar fix in core
.
w
o
rktr
e
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Jaku
b
Narebsk
i
gitweb: Fix parsin
g
of negati
v
e f
r
actiona
l
t
imez
o
nes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hamano
M
erge
b
ranc
h
'nm/maint-
c
onfl
i
cted-submodule-e
n
tries'
commit
|
commitdiff
|
tree
2011-04-03
Junio
C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2011-04-03
J
unio C
Hamano
St
a
rt preparing for
1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Jeff K
i
ng
pull: do not clobbe
r
u
n
tra
c
ked files on initial pull
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Ju
n
i
o
C H
a
mano
Mer
g
e branch 'jc/index
-
u
p
da
t
e-if-able' into maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge branch
'
lt/d
e
fa
u
lt-abbrev'
into maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C
Ha
m
ano
Merge
b
ran
c
h 'jc/main
t
-rev-li
s
t-culled
-
b
o
undary' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
J
unio C Ham
a
no
M
erge branch 'mm/maint-log-n-with-d
i
ff-filtering' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Juni
o
C Hamano
M
e
rge branc
h
'jk/forma
t
-
patch-multi
l
ine
-
header' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Jun
i
o C Hamano
Merge bra
n
ch 'jn
/
maint-in
s
taw
e
b-
p
lack-fix'
i
nto maint
commit
|
commitdiff
|
tree
2011-04-03
Jun
i
o C
Hamano
Merge br
a
n
c
h
'lp/config-vername-ch
e
c
k'
into maint
commit
|
commitdiff
|
tree
2011-04-03
Michael
J
Gruber
sha1_name:
S
ugges
t
c
o
mmit:
.
/file for path in subdir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Michael J Gru
b
er
t1506: factor out test for "Did you m
e
an
.
.
.
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Jonath
a
n
Nieder
c
o
m
pa
t
: add missing #incl
u
de <sys/res
o
urce
.
h
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Law
r
ence Mit
c
hell
git
.
el: Do
n
't us
e
font-lo
c
k-compile
-
keyw
o
rds
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Æ
var Arn
f
j
ör
ð
Bjarmason
t2019-checko
u
t
-ambigu
o
u
s
-ref
.
sh:
dep
e
nd on C_
L
OCAL
E
_OUTPUT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next