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
Merge branch 'jk/merge-one-file-working-tree' into maint
2011-05-13
Jun
i
o C Hamano
Merge branch 'j
k
/m
e
r
g
e-one
-
f
i
le-working-
t
r
e
e' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
io
C Hamano
Merge branch 'jc/fi
x
-
d
iff-f
i
les-unme
r
g
e
d' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io
C
Hamano
Merge branch 'mz/mai
n
t-rename-unm
e
rged' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Johan
H
e
rland
t54
0
0: F
i
x
a
couple
o
f
t
y
p
os
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
oão Britto
R
e
mov
e
duplicated "is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Haman
o
t3701
:
fix here document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Michael
J
G
r
u
be
r
gi
t
-fa
s
t
-import
.
txt: --rel
a
tive-mar
k
s takes no pa
r
ameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dim
a
S
h
a
r
ov
shel
l
: ad
d
missing in
i
tialization of argv0_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hama
n
o
Git 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Merge b
r
a
n
c
h 'j
h
/dirstat' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
m
a
n
o
Merge branch 'sp/maint-clear
-
postfie
l
ds
'
i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
r
ge branch
'jk/ma
i
nt-stash
-
oob' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Mer
g
e branch 'jk/maint-
u
plo
a
d-p
a
ck-shallow
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
M
e
rge bran
c
h 'dm/stash-k-i-p
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Mer
g
e
b
ranch 'jc/
p
ack-ob
j
ects-bigfile' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio
C Ham
a
no
Merge bran
c
h
'
mg/r
e
flog-w
i
th-options
'
into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io
C
Ham
a
no
Merge br
a
nch
'
jk/stash
-
lo
o
sen-safety' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
n
o
M
e
r
g
e branch 'ar/c
l
ean-rmdir-empt
y
' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Mer
g
e branch 'mg/
s
h
a
1-pa
t
h-advise'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Valentin Ha
e
nel
g
i
t-ad
d
.
t
xt:
document 'add
.
i
g
noreErrors'
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
merge-one-file: f
i
x broken merges with alt
e
rnate work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Je
f
f
Ki
n
g
add tests for merge-index / me
r
ge-one-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C
Ha
m
ano
St
a
rt 1
.
7
.
5
.
1
m
aintenance
t
rac
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Hamano
Merge branc
h
'mg/x-year
s
-12-months' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-04-29
Sylvai
n
Rabot
git-sen
d
-
email: fix
mi
s
s
i
ng
sp
a
ce i
n
error message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
J
unio
C
Ham
a
no
http: clear PO
S
TFIELDS wh
e
n
i
nitializing a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Jun
i
o C Hamano
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff-files: show unmerged
e
ntries correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ha
m
a
no
diff: remove often unused
par
a
meters from
diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
i
o C Ha
m
ano
di
f
f
.
c: return f
i
l
epair fro
m
dif
f
_unmer
g
e(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
test: use
$
_z40
from test
-
lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Mic
h
a
e
l
J
Gruber
date
:
avoid "X years, 12 m
o
nths
"
in
relative dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C
Hama
n
o
Git 1
.
7
.
5-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Ju
n
io C Hamano
Sync
w
ith 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Jun
i
o C Hama
n
o
Git 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
M
i
ch
a
el J Gru
b
er
git-svn
.
txt: Docume
n
t --me
r
geinfo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
J
u
nio C Hamano
Revert "
r
u
n
-command: prettify -D_FORTIFY_SOURCE
workaround"
commit
|
commitdiff
|
tree
2011-04-14
Ju
n
io C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2011-04-14
R
e
n
é
S
cha
r
fe
arch
i
ve: document
l
im
i
t
atio
n
o
f
tar
.
umas
k
config se
t
t
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J
Gr
u
be
r
t3306,t5304: avoid cl
o
ck s
k
ew issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Mi
c
hael J Grube
r
git
.
txt: fix list conti
n
ua
t
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Ham
a
no
G
it 1
.
7
.
5-
r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ju
n
i
o C H
a
m
an
o
M
erg
e
branch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2011-04-13
J
u
nio C Hamano
Me
r
ge branch 'jc/rev-list-op
t
ions-fix' into m
a
int
commit
|
commitdiff
|
tree
2011-04-13
J
unio C H
a
mano
Merge branch 'js/
c
h
eckout-unt
r
acked-symlin
k
' into main
t
commit
|
commitdiff
|
tree
2011-04-13
Jim
Meyering
remov
e
doubled words, e
.
g
.
, s/t
o
to/to/,
a
nd fix related
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ramkumar Ramachandra
reve
r
t: Hide '-r' option in
d
efault
u
sage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Joha
n
Herland
--dirstat: In
case of renames, use target fi
l
ename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hamano
Merge branch 'js/che
c
kout-untrac
k
ed-symlink'
commit
|
commitdiff
|
tree
2011-04-12
Juni
o
C Hamano
Me
r
ge branch
'
nd/init-git
d
ir'
commit
|
commitdiff
|
tree
2011-04-12
J
ohannes Sixt
t2021: mark a test a
s
fixed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
J
oha
n
nes Si
x
t
t0001: guard
a
n
ew test with SYMLINKS p
r
ere
q
uisite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herland
Tea
c
h -
-
dirs
t
at not to completely ign
o
re
rearra
n
ged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ævar
Arnfjörð
B
jarmason
Makefil
e
:
e
xtract
Q
_()
s
o
ur
c
e
s
t
r
ings
a
s nget
t
ext()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ramsay J
o
n
es
i18n: avoid parent
h
esized
string
a
s ar
r
ay i
n
itializer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herl
a
nd
-
-
dirstat-b
y
-file
:
Make it faster
and
m
ore correct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
-
-dirstat: D
e
s
c
ri
b
e non-obviou
s
differences relat
i
ve
.
.
.
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
J
u
nio C
Hamano
Merge git://git
.
bogomips
.
o
r
g/git-
s
vn
commit
|
commitdiff
|
tree
2011-04-11
Junio
C Ham
a
no
Merge git://git
.
kernel
.
o
r
g
/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2011-04-07
D
a
n Mc
G
ee
stash: en
s
u
r
e
-
-n
o
-keep-inde
x
and --patch can be used
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Dan McGee
st
a
s
h: add two more te
s
ts f
o
r --no-
k
eep-ind
e
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Andr
e
w Garber
git
-
p4: replac
e
each tab with 8 sp
a
ces f
o
r consistency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
J
eff Ki
n
g
upload
-
p
ack:
s
t
ar
t
p
ack-obj
e
cts before async rev-list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio
C H
a
mano
Git 1
.
7
.
5-
r
c1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ham
a
no
S
ync with 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
G
i
t 1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Ju
n
io C
Hamano
Merge bran
c
h 'nm
/
m
aint-conflicted-submodule
-
entries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Junio
C Hamano
Merge branch 'mg/re
v
-list-n
-
reverse-doc'
i
nto
m
a
int
commit
|
commitdiff
|
tree
2011-04-06
Junio
C Hamano
Merge bran
c
h
'jk/maint-remote-mirror-safer'
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ha
m
ano
M
e
rge
b
ranch
'
mg/
d
o
c-revisions-txt'
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
s
t
ash: dro
p
dirty
w
orktre
e
check on
apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Teach c
o
re
.
bigfilethreas
h
old
t
o pack-objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jon Seymour
stash: fix f
a
lse
p
ositive in the invalid re
f
tes
t
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
J
eff King
st
a
sh
:
fix acci
d
e
ntal
a
pp
l
y of non-existent st
a
shes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Michael J G
r
u
b
er
re
v
isions
.
t
xt
:
langu
a
ge impr
o
vements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Ju
n
io
C
Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2011-04-04
Junio C
Hamano
Merge branch 'jl/submodule-fetc
h
-on-dema
n
d'
commit
|
commitdiff
|
tree
2011-04-04
Junio C
H
ama
n
o
M
erge bra
n
ch 'jc/
r
ev-list-op
t
ion
s
-fix'
commit
|
commitdiff
|
tree
2011-04-04
SZ
E
DE
R
G
ábor
Documentation:
t
rivial grammar fi
x
in core
.
worktree
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Jakub Na
r
ebski
gitwe
b
: Fi
x
parsing of negative
fraction
a
l timezones
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Junio
C
Ham
a
n
o
M
e
r
ge bra
n
ch 'nm/
m
aint-conflicte
d
-
s
ubmo
d
ule-entries'
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
M
e
rge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2011-04-03
Ju
n
io
C Ham
a
n
o
Start prepa
r
ing 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 cl
o
bber untracked
files on initial
pull
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge branch 'jc/index-update-if-able
'
int
o
maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C H
a
mano
Merge
branch 'lt/default-abbrev' into m
a
int
commit
|
commitdiff
|
tree
2011-04-03
Junio C
H
amano
Merg
e
branch 'jc/ma
i
nt-rev-list-
c
ulled-boun
d
ary' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge branch 'mm/maint-lo
g
-n-w
i
th-di
f
f-filtering
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C H
a
mano
Me
r
g
e branc
h
'
j
k
/format-pa
t
c
h-multiline-
h
e
a
der'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge bran
c
h 'jn/maint-instaweb-plac
k
-fix' into maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge b
r
anch
'
lp/config-vername-chec
k
' into
m
ain
t
commit
|
commitdiff
|
tree
2011-04-03
Mic
h
ael J Gruber
sha1_name: Suggest c
o
mmit
:
.
/file
f
or pa
t
h in
subdir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Mi
c
h
a
el J Gru
b
er
t1506: factor out test for "Did you me
a
n
.
.
.
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Jonat
h
an Nieder
com
p
at: a
d
d missing
#inclu
d
e <sys/resource
.
h>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
L
a
wrence Mitchell
git
.
el:
Don't use
f
ont-lock-compile
-
keywords
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Æva
r
Ar
n
fjörð Bjarmason
t
2
019-checkout
-
ambiguous-ref
.
sh: depend on C
_
LOCALE_OUTPUT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Dan McGee
F
i
x two u
n
used variable w
a
rni
n
gs in
g
cc 4
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Dan McGee
Remo
v
e
o
l
d bin
a
ries from
.
g
itign
o
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Stephen Boyd
sparse: F
i
x errors a
n
d silence w
a
rnin
g
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
J
u
nio
C
Hamano
U
p
date rel
e
ase
n
otes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next