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
Merge branch 'gr/cvsimport-alternative-cvspass-location' into maint
2011-05-13
J
u
nio C Ha
m
ano
Merge branch 'gr/
c
v
simport-alt
e
r
native-cvsp
a
ss-loca
t
io
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
M
e
rge branch 'c
j
/
p4merge'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Me
r
ge
branch
'
j
k/merge-o
n
e-file-workin
g
-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
ni
o
C Hamano
Merge branch 'jc/fi
x
-diff-file
s
-un
m
erg
e
d' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge br
a
nch 'mz/maint-rename-unmerged' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Joh
a
n
Herl
a
nd
t5400: Fix a couple of
typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Joã
o
B
r
i
tto
Remove duplic
a
ted "is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t3701: fix h
e
re document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
M
ichael J Grub
e
r
git-fast-
i
mport
.
txt: --rel
a
tive
-
m
a
rks ta
k
es no parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
shel
l
: ad
d
missing
i
nitializat
i
o
n o
f
argv0_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
Git 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'jh/dirstat' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C
H
amano
Merge branch 'sp/maint-clear-postfields' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge br
a
nch 'jk/maint-stas
h
-
oob' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Me
r
ge branch
'
jk/m
a
int-uplo
a
d-pack-shal
l
ow' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
b
ranch
'dm/s
t
ash-k-i-p
'
int
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C H
a
mano
Merge branch 'jc/pack-ob
j
ects-bigf
i
le' int
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
erge branch '
m
g/reflog
-
with-o
p
tions' i
n
to main
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
i
o C Hama
n
o
Merge br
a
nch 'jk/stash-loose
n
-sa
f
ety' into
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C
H
amano
Merge branch 'ar/clean-r
m
d
i
r-e
m
pty'
in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
M
erge
branch 'mg/sha1-path-advise
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Valentin Haenel
git-add
.
tx
t
: docume
n
t
'add
.
ignor
e
Errors
'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Ciaran Jess
u
p
Pass empty file to p4merge
w
h
ere
n
o bas
e
is suitable
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy
R
ouill
i
e
r
Look
f
o
r password in both CVS and CV
S
N
T
password files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff
Ki
n
g
merge-one-file: fix
b
roken merges with alt
e
rnate wor
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff Kin
g
add tests for merge-index / mer
g
e-one-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
unio C Hamano
Start 1
.
7
.
5
.
1 mai
n
tenance trac
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Ha
m
ano
Merge branch 'mg/
x
-y
e
ars-1
2
-months' into ma
i
nt
commit
|
commitdiff
|
tree
2011-04-29
Sy
l
vain Ra
b
ot
gi
t
-
s
end-email: fi
x
missing
space in error message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
J
u
ni
o
C Hamano
h
ttp: clea
r
POSTF
I
ELDS when i
n
itiali
z
ing a s
l
ot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C
H
ama
n
o
diff-f
i
le
s
: show
unmerged
e
ntries correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
i
o
C Hamano
diff: re
m
ove
often unused
p
arameters
from diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C
Hama
n
o
diff
.
c: return filep
a
ir from diff_unmerge
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C Hamano
test:
use $_z
4
0 from test-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Michael J Gruber
d
ate: avoid "X years,
12 months" in re
l
ativ
e
dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C H
a
m
a
no
Git
1
.
7
.
5-
r
c3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C H
a
m
a
no
Sync
with 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Ju
n
io C Hamano
Git 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Michae
l
J
Gr
u
ber
g
i
t-svn
.
t
x
t
:
Document --mergeinf
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Hamano
Revert "run-co
m
m
a
n
d
:
p
rettify
-D_FORTIFY_SOURC
E
wo
r
karound"
commit
|
commitdiff
|
tree
2011-04-14
Junio C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2011-04-14
René Scharfe
a
r
c
h
i
v
e: do
c
u
m
ent limitation of tar
.
u
m
ask con
f
ig sett
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gr
u
ber
t3306,t5304:
a
v
o
id
clock skew
issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Grub
e
r
git
.
txt: fi
x
list continu
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Git 1
.
7
.
5-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C
H
amano
Merge br
a
nch 'maint
'
commit
|
commitdiff
|
tree
2011-04-13
Jun
i
o C Hamano
Merge branch
'
j
c/r
e
v
-list-options-fix' into
maint
commit
|
commitdiff
|
tree
2011-04-13
Junio C Haman
o
Merge
b
ranch 'js/checkout-untracked-symlink' into maint
commit
|
commitdiff
|
tree
2011-04-13
Jim Mey
e
r
ing
remo
v
e
d
o
ubled wo
r
d
s, e
.
g
.
, s/t
o
to/to/, an
d
f
ix r
e
lated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ramku
m
ar Ramachand
r
a
r
evert: Hide '-r' optio
n
in defaul
t
u
sage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--
d
irstat:
I
n
c
a
se of renam
e
s, use target filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Junio C
H
amano
Merge branch
'
js/checkout-untra
c
ked-sym
l
i
n
k'
commit
|
commitdiff
|
tree
2011-04-12
Junio C H
a
mano
M
erg
e
b
ranch 'nd/init-gitdir'
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
nnes Sixt
t202
1
: ma
r
k a test as fixed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Johannes Sixt
t0001:
gu
a
rd a
n
ew
t
es
t
with SYMLINKS prereq
u
isite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
r
land
Teac
h
--d
i
rstat not
to completely igno
r
e rearranged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ævar Arnfjörð Bjarmaso
n
Makefile
:
e
xtrac
t
Q_() sour
c
e st
r
ings
as n
g
ettext()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ramsay Jones
i18n: avoid parenthesized string as array initial
i
zer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat-b
y
-file: Ma
k
e it fast
e
r and more correct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herlan
d
-
-dirs
t
at
:
De
s
cribe non-obvio
u
s differences r
e
lative
.
.
.
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Junio C H
a
m
ano
Merge git://git
.
b
ogomips
.
o
r
g/git-svn
commit
|
commitdiff
|
tree
2011-04-11
Junio
C
H
amano
Me
r
ge git://git
.
ke
r
nel
.
org/
p
ub/scm/gitk/gi
t
k
commit
|
commitdiff
|
tree
2011-04-07
Dan McG
e
e
stash: ensure -
-
no-keep-index and --patch can be used
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Dan McGee
s
tash: ad
d
t
w
o more tests for --no-keep-index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Andrew Garber
git-
p
4
:
r
e
place each
tab wit
h
8 spaces for
c
onsistency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jeff K
i
ng
upl
o
ad-pack:
s
tart p
a
ck-objects be
f
ore
a
sync rev
-
list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
J
un
i
o C Hamano
Git 1
.
7
.
5-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o C Ham
a
no
Sync w
i
t
h
1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Junio C
H
amano
Git 1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Haman
o
Mer
g
e
b
ranch 'nm/mai
n
t-confli
c
ted-
s
u
b
module-entries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ham
a
no
Me
r
ge branch 'm
g
/rev-l
i
st-n-reverse-doc
'
into maint
commit
|
commitdiff
|
tree
2011-04-06
Junio
C Hamano
Merge
b
ranch 'j
k
/maint-re
m
ote-mirror-saf
e
r'
commit
|
commitdiff
|
tree
2011-04-06
J
u
ni
o
C Hamano
Merge branch
'mg/do
c
-revisions-
t
xt'
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
s
tash: drop
d
irty
w
o
rktree c
h
eck on apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Teach core
.
bigfilethr
e
ashol
d
to pac
k
-obje
c
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jon S
e
ymour
stash: fix false positive in the invalid ref tes
t
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jef
f
K
i
ng
stas
h
: fix acc
i
d
e
nt
a
l appl
y
o
f non-exi
s
tent
stashes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Mic
h
ael
J Gruber
revisi
o
ns
.
t
x
t: language improvements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hamano
M
er
g
e branch 'maint
'
commit
|
commitdiff
|
tree
2011-04-04
J
unio C Haman
o
Merge
branch 'jl/submo
d
ule-fetch-on-de
m
a
n
d'
commit
|
commitdiff
|
tree
2011-04-04
J
u
n
io
C
H
amano
Merge branch 'jc/r
e
v-list-
o
p
t
ions-fix'
commit
|
commitdiff
|
tree
2011-04-04
S
ZEDE
R
Gáb
o
r
Documentation: trivial grammar fix in core
.
worktree
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Jakub Narebski
gitweb: Fix parsing
o
f negative fractio
n
al timezones
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hama
n
o
Mer
g
e branc
h
'nm/maint-conf
l
icted-s
u
bm
o
d
u
le-entries'
commit
|
commitdiff
|
tree
2011-04-03
Jun
i
o C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2011-04-03
Junio C Haman
o
Start pre
p
aring
for
1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Jeff King
pull: do not clobber untracked fi
l
es on initial p
u
ll
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge branch
'
jc/index-upd
a
te-
i
f
-
able'
into maint
commit
|
commitdiff
|
tree
2011-04-03
Jun
i
o C Hamano
Merge bra
n
ch 'lt/default-ab
b
rev' into main
t
commit
|
commitdiff
|
tree
2011-04-03
Juni
o
C Hamano
Merge branch
'
j
c
/
main
t
-rev-list-c
u
lled-b
o
u
n
d
ary' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge branch 'mm/maint-log-n
-
with-diff
-
f
iltering' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
J
unio C Ham
a
no
Me
r
g
e bran
c
h
'jk/for
m
at-patch-
m
ultiline-h
e
a
der' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
J
u
nio C Hamano
M
e
rge branch 'jn/maint-instawe
b
-plack-fix' into maint
commit
|
commitdiff
|
tree
2011-04-03
Jun
i
o C Hamano
Merg
e
b
r
an
c
h 'l
p
/con
f
ig-ve
r
name-check' into maint
commit
|
commitdiff
|
tree
2011-04-03
Michael J Gruber
sha1_name: Suggest commit:
.
/file for
p
at
h
in
s
ubdir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Michael J Gruber
t1506
:
factor out test for "Did you mean
.
.
.
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Jonathan
N
i
eder
comp
a
t: add missing #include <sys/resource
.
h>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Lawrence Mitchell
g
it
.
e
l: Don't use fo
n
t
-lock
-
c
o
mpi
l
e-keywords
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Ævar Ar
n
fjörð Bj
a
rmas
o
n
t
2
019-checkout-ambiguous
-
re
f
.
sh: depend on C_
L
OCALE_O
U
TPUT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next