repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jk/merge-one-file-working-tree' into maint
2011-05-13
Junio C
H
amano
Merge
b
ranch 'jk/merge-one-file-working-tre
e
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
io C
Ham
a
no
Mer
g
e
branch '
j
c/fix-diff-
f
iles-unmerged
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
M
e
rge
branch 'mz/m
a
i
nt-rename-unmerge
d
' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Johan Her
l
an
d
t5400:
F
i
x a couple of typos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
João Brit
t
o
Re
m
ove duplicated "is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C H
a
mano
t3
7
01: fix
he
r
e
do
c
ument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
M
i
chael
J G
r
ube
r
g
i
t-fast
-
import
.
t
x
t: --
r
e
la
t
ive-m
a
rks takes no paramete
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Di
m
a Shar
o
v
shell: add missing initia
l
i
zation of a
r
gv0_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Git 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Me
r
g
e
branch 'jh/dirstat' int
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Merge branch 'sp/
m
aint-cl
e
ar-post
f
ie
l
ds' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge
branch 'j
k
/main
t
-
stash-oob' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Ha
m
ano
M
e
rge bran
c
h 'jk/maint-upload-pa
c
k-sha
l
low' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Ham
a
no
Mer
g
e br
a
nch 'dm
/
stash-k-i-p'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Me
r
ge bran
c
h 'jc
/
pack-objects-bigfi
l
e' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
n
o
Mer
g
e branch 'mg/reflog-with-options' into
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Mer
g
e
branc
h
'jk/stash-l
o
osen-safety'
i
nt
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'ar/clean-rmd
i
r-empty' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge branc
h
'mg/sha1-path-advise' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Val
e
ntin Haene
l
git-add
.
t
xt: document 'add
.
igno
r
eE
r
ro
r
s
'
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
m
e
rge
-
one-file: fix b
r
oken
m
erges
with al
t
ernate w
o
rk
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jef
f
King
add
t
ests for mer
g
e-index / merg
e
-one-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
Hamano
St
a
rt 1
.
7
.
5
.
1 mainten
a
nce track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Me
r
ge br
a
nch 'mg/x-years-1
2
-m
o
nths' in
t
o maint
commit
|
commitdiff
|
tree
2011-04-29
S
y
lvai
n
Rab
o
t
g
i
t-send-email:
f
ix
miss
i
ng
spac
e
in error m
e
ssage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
J
u
nio C Hamano
ht
t
p: clear POSTFIELDS when initializing a sl
o
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C H
a
man
o
Git
1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff-file
s
:
sh
o
w u
n
m
e
r
g
ed entries
c
orrectly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio
C Hamano
diff: remove often unus
e
d
parameter
s
fr
o
m dif
f
_
unmerge
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff
.
c: return filepair
from diff_unmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C H
a
m
a
no
test
:
use $_z4
0
from test-lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
Michael
J
G
ru
b
er
date: avoid
"
X
years, 12
mon
t
hs" i
n
relative d
a
t
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Jun
i
o
C Hamano
Git 1
.
7
.
5-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C
H
amano
Sync w
i
th 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
J
u
nio C Hamano
Git 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Mic
h
ael J Gruber
git-svn
.
tx
t
: Document --m
e
rgeinfo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
J
u
n
i
o C Hamano
Revert "r
u
n-command: prett
i
fy -D
_
FORTIFY_SO
U
R
C
E
workaround"
commit
|
commitdiff
|
tree
2011-04-14
Junio C Haman
o
M
erge branch
'
m
aint'
commit
|
commitdiff
|
tree
2011-04-14
René Scharfe
archi
v
e: document li
m
itation of tar
.
uma
s
k
c
onfig
s
e
tti
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Micha
e
l J Gruber
t3306,
t
5304: av
o
id cloc
k
skew issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gruber
git
.
txt:
f
ix list continuation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C H
a
m
an
o
Git 1
.
7
.
5-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Jun
i
o C Haman
o
Merge
b
r
anch 'mai
n
t'
commit
|
commitdiff
|
tree
2011-04-13
Junio C H
a
man
o
Merge branch 'jc/rev-list-options-fi
x
' into m
a
int
commit
|
commitdiff
|
tree
2011-04-13
Junio C
H
amano
Merge branch 'js/checkou
t
-untrack
e
d-syml
i
nk' into maint
commit
|
commitdiff
|
tree
2011-04-13
Jim Meyering
remove
doub
l
ed word
s
, e
.
g
.
, s
/
to to/to/, a
n
d f
i
x
rel
a
ted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Ramkumar
Ramachandra
r
evert:
H
i
de '-r' opti
o
n in default usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Joha
n
Her
l
and
-
-di
r
s
tat: In
c
ase of re
n
ame
s
,
u
se target
f
ilename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Jun
i
o C Haman
o
Merg
e
branch
'
j
s
/c
h
eckout-untracked-syml
i
nk'
commit
|
commitdiff
|
tree
2011-04-12
Junio C
H
amano
Merge branch 'nd/i
n
it-gi
t
dir'
commit
|
commitdiff
|
tree
2011-04-12
Johanne
s
Six
t
t2021:
mark a test as fixed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Johannes Si
x
t
t0001:
g
uard a n
e
w t
e
st with SYMLIN
K
S p
r
erequi
s
i
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
T
e
ach --dirstat n
o
t to compl
e
tely ign
o
re
rearranged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Æ
v
a
r
A
rnfjörð Bjarmason
Makef
i
le: ext
r
act Q_()
s
o
urce strings as ngett
e
x
t()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Ramsay J
o
nes
i18n: avoid pa
r
enthesized string as arra
y
initi
a
liz
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herland
--dirstat-by-file: Make it faster and more correct
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herl
a
n
d
--
d
irst
a
t: Describe non-obvious differences
r
elativ
e
.
.
.
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Ju
n
io C Hamano
Merge git:
/
/git
.
bogom
i
ps
.
org/gi
t
-svn
commit
|
commitdiff
|
tree
2011-04-11
Junio C Hamano
M
erg
e
git:/
/
git
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2011-04-07
Dan M
c
Gee
stash: e
n
sure --no-keep-index an
d
--patch
c
an be used
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
Da
n
McG
e
e
stash: ad
d
t
wo
more
t
e
sts for --no-keep-index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
Andrew Garb
e
r
g
i
t-p4: replace each
tab
w
ith
8
s
paces for consisten
c
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
upload-pack
:
start pack-object
s
before async
r
ev-
l
ist
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
Hamano
Gi
t
1
.
7
.
5-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Ju
n
io C Hamano
Sync
with 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ha
m
an
o
Git 1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C
Hamano
Merge branch 'nm/maint-conflic
t
ed-submo
d
ule-entries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
J
unio C Hamano
Merge branch 'mg/
r
ev-list-n-reverse-doc' into m
a
in
t
commit
|
commitdiff
|
tree
2011-04-06
Junio C H
a
ma
n
o
Merge bran
c
h 'jk/maint-remote-
m
irror
-
safer'
commit
|
commitdiff
|
tree
2011-04-06
Juni
o
C
Ham
a
no
Me
r
ge branch 'mg
/
doc-re
v
is
i
o
ns
-
txt'
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash:
drop dirty wo
r
ktree
c
h
e
ck on
apply
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Teach cor
e
.
bigfi
l
ethre
a
shold to pack-objects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jon S
e
y
m
our
stash:
fix false
p
ositive in
t
he
i
n
valid
ref test
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash: fix
a
ccide
n
tal apply of
non
-
exi
s
t
ent
stashe
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Michael
J Gruber
revisions
.
txt: language imp
r
ovements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Ju
n
io C H
a
mano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2011-04-04
Junio
C
Ham
a
no
M
e
rge branch 'jl/submodule-fetch
-
on-deman
d
'
commit
|
commitdiff
|
tree
2011-04-04
Junio
C
Hamano
Merge
branch 'jc
/
rev-
l
ist
-
op
t
ions-fix'
commit
|
commitdiff
|
tree
2011-04-04
SZEDER
G
á
bor
Docum
e
ntation: trivial gramm
a
r fix in core
.
work
t
ree
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
J
a
kub Narebski
gitweb: Fix parsing of negative fractional time
z
on
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Jun
i
o C Hamano
Merge branch 'nm/ma
i
n
t-conflicted-submodule-entries'
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge
branc
h
'm
a
int
'
commit
|
commitdiff
|
tree
2011-04-03
Juni
o
C Hamano
Sta
r
t preparing for 1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Jeff King
pul
l
: do
n
o
t clobbe
r
untracked fi
l
es on initial pull
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
J
u
nio C Hamano
M
erge branch '
j
c/index-u
p
d
a
te-i
f
-able' into maint
commit
|
commitdiff
|
tree
2011-04-03
Ju
n
io C Hamano
Merge b
r
anch '
l
t/default-abbrev' into ma
i
nt
commit
|
commitdiff
|
tree
2011-04-03
J
unio C Hamano
Mer
g
e branch 'jc/maint-rev-list-culled-boundary' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio
C
H
a
man
o
Merge
b
ranch 'm
m
/maint
-
log-n-wit
h
-diff-filt
e
ring' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Ha
m
ano
Merge b
r
a
n
c
h
'
j
k
/
f
ormat-patch-multiline-header' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
M
e
rge
branch 'jn/
m
aint-ins
t
a
web-plack-fix' into
m
aint
commit
|
commitdiff
|
tree
2011-04-03
J
u
n
io C Ham
a
no
Merge b
r
a
nch 'lp/config-ve
r
name-c
h
eck' into maint
commit
|
commitdiff
|
tree
2011-04-03
Michael J Gr
u
b
er
sha1_name:
S
uggest commi
t
:
.
/
f
ile for
p
ath in subd
i
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Michael J Gruber
t1506: fa
c
t
o
r
o
u
t
test for "Did you me
a
n
.
.
.
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Jonathan N
i
ed
e
r
compat: add missing
#
i
nc
l
ude
<
sy
s
/
r
esource
.
h>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Lawrence Mitchell
git
.
el: D
o
n't us
e
font-loc
k
-compile-ke
y
words
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Ævar A
r
nfjör
ð
B
j
a
rmason
t
2
019-checko
u
t-ambi
g
u
o
u
s
-ref
.
sh: depend on C_LO
C
ALE
_
OUTPUT
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Dan Mc
G
ee
Fix two unused va
r
iabl
e
warnings in gcc
4
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Dan McGee
Remove old
b
inaries
from
.
gitign
o
re
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Stephen Boyd
spa
r
s
e: Fix
e
rrors
an
d
silence warnings
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Junio
C Hamano
Update r
e
le
a
se notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next