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 'nd/resolve-ref'
2011-12-08
J
uni
o
C
H
amano
commit: honour --no-ed
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-08
Jonathan
N
ieder
t7
5
01 (co
m
mit): moderniz
e
style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-08
Jonatha
n
N
i
e
der
test: remove
a
p
orcelain te
s
t t
h
at hard-codes commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-08
Jonathan Nieder
test:
a
d
d
mi
s
sing "&&" af
t
er echo
c
ommand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-08
Jens L
e
hmann
diff/status: print sub
m
odule path when looking for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-08
Michael Hagg
e
rty
git symbolic-ref: documentation
f
ix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-06
Thomas Rast
reset: update
c
ache-tree data when a
p
pr
o
p
r
iate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-06
T
h
omas
Ra
s
t
commit: writ
e
cache-tree
d
at
a
whe
n
writing index anyway
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-06
Thomas R
a
st
Refa
c
tor cache_t
r
ee_update
id
i
o
m
from c
o
m
mit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-06
Thom
a
s
R
ast
Test the
curre
n
t state of
the cache-tree
o
pti
m
i
zation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-06
Thom
a
s Rast
Add test-scrap-cache
-
tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-06
Thomas Rast
userdiff:
a
l
low * b
e
tween cpp f
u
ncname words
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-06
Junio C Hamano
M
erge bra
n
ch 'master' of git:
/
/
bogom
i
ps
.
org/git-svn
commit
|
commitdiff
|
tree
2011-12-06
Ng
u
yễn
T
hái Ngọc Duy
C
o
py resolve_ref
(
)
return valu
e
for longer
u
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-05
Junio C Hamano
K
ick-off the 1
.
7
.
9
cycl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-05
Ju
n
i
o
C H
a
mano
M
e
r
g
e branch 'jk/refresh-p
o
rcelain
-
ou
t
put'
commit
|
commitdiff
|
tree
2011-12-05
Jun
i
o
C Hamano
Mer
g
e
branch 'gh/us
e
rdiff-mat
l
a
b
'
commit
|
commitdiff
|
tree
2011-12-05
Junio C Hamano
Merge branch 'nd/maint-ignore-exclude'
commit
|
commitdiff
|
tree
2011-12-05
Junio C H
a
mano
M
erge
branch
'vr/git-merge-d
e
fault-to-up
s
trea
m
'
commit
|
commitdiff
|
tree
2011-12-05
Junio C Hamano
Mer
g
e branch 'jc/maint-pack
-
object-cycle'
commit
|
commitdiff
|
tree
2011-12-05
Ju
n
io C Hamano
Merge branch 'jc/index-pack-reject
-
dups'
commit
|
commitdiff
|
tree
2011-12-05
Jun
i
o
C
H
a
mano
Merge
bra
n
ch 'vr/msvc'
commit
|
commitdiff
|
tree
2011-12-05
J
u
nio C
Hamano
Merge
branch '
n
a/strtoimax'
commit
|
commitdiff
|
tree
2011-12-05
Junio C Hamano
M
e
rge bran
c
h 'ab/cla
n
g-lints'
commit
|
commitdiff
|
tree
2011-12-05
Ju
n
io C Haman
o
Merge b
r
anch
'
n
d
/
prune-progress'
commit
|
commitdiff
|
tree
2011-12-05
J
u
n
io C Hamano
Merge branch
'nd/
f
sck-pr
o
gress'
commit
|
commitdiff
|
tree
2011-12-05
Juni
o
C Hamano
Merge branch
'
mf/curl-select-fdset'
commit
|
commitdiff
|
tree
2011-12-05
Junio C Ha
m
an
o
Mer
g
e
branch 'nd/misc-cleanups'
commit
|
commitdiff
|
tree
2011-12-05
Junio C
H
a
man
o
Merge
b
ran
c
h 'mai
n
t
'
commit
|
commitdiff
|
tree
2011-12-05
Junio
C
H
a
mano
Mer
g
e bra
n
ch 'maint-1
.
7
.
7' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-12-05
Junio
C
Hamano
M
erge branch
'
maint-1
.
7
.
6
'
i
n
t
o
maint-1
.
7
.
7
commit
|
commitdiff
|
tree
2011-12-05
J
e
ff
K
ing
s
t
ripspace: f
i
x outd
a
ted comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-05
P
e
te Wyckoff
git-
p
4: i
n
tro
d
uc
e
s
kipSubm
i
tEdit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-05
Se
b
astian
Morr
Add
MY
M
E
TA
.
yml to perl/
.
gitign
o
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-05
Brandon Casey
bu
i
ltin
/
a
p
ply
.
c: repor
t
error on f
a
ilu
r
e to r
e
cogn
i
ze
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-05
Bra
n
d
on Cas
e
y
t/t4131
-
a
pp
l
y
-fak
e
-ancest
o
r
.
sh: fix broken
t
e
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-05
Junio C Hamano
Me
r
g
e branc
h
'js/me
r
ge-ed
i
t-option'
commit
|
commitdiff
|
tree
2011-12-05
J
ack
N
a
g
e
l
Doc
u
mentation: f
i
x fo
r
ma
t
tin
g
erro
r
i
n
m
erge-options
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-02
Jun
i
o C H
a
man
o
Git
1
.
7
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-01
J
u
nio C
H
a
mano
bulk-
c
h
e
c
k
i
n: repl
a
c
e
f
a
st-imp
o
r
t
b
ase
d
impl
e
ment
a
ti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-30
Ju
n
io C
Hamano
cs
u
m-file: int
r
oduce sha1f
i
le_checkpoint
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-30
Andrew W
o
ng
re
b
a
se -i
:
i
n
terru
p
t rebase when "comm
i
t --ame
n
d
"
f
a
ile
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
fa
s
t-import: Fix incorre
c
t fanout level when modifying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-29
Johan He
r
lan
d
t9301:
Add 2nd
testcase exposing bug
s
in fas
t
-impor
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han Herland
t9301: Fix tes
t
case covering up
a
b
ug
in fast-import
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-28
Junio C
H
ama
n
o
G
i
t 1
.
7
.
8
-
rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-28
Jonathan Nieder
Allo
w
checkout -B <curre
n
t-
b
ranch> t
o
u
pdate the current
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-28
Jonath
a
n Nieder
branch: all
o
w a
no-op "b
r
a
n
ch
-
M <current-branch> HEAD"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-28
Carl
o
s
Mart
í
n Nieto
convert:
t
rack state in LF-
t
o
-
CRLF fil
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-28
N
g
u
yễn
Th
á
i Ngọc Duy
checkout,me
r
ge
:
d
isallow overwriting
i
gnored files
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-28
Ju
n
io C Hamano
Mer
g
e
b
ranch 'nd/maint-i
g
nore
-
exc
l
ude' into nd/ig
n
ore
.
.
.
commit
|
commitdiff
|
tree
2011-11-28
N
g
u
yễn Thái Ngọc Duy
c
h
ec
k
o
ut,merge: loose
n
overwriting untra
c
k
ed file check
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
Junio
C
Hamano
Merge branch
'maint
'
into
tj/
i
ma
p
-send-remove-unu
s
ed
commit
|
commitdiff
|
tree
2011-11-23
T
h
omas Jarosch
imap-send
:
R
e
m
ov
e
unuse
d
'use_n
a
mespace'
vari
a
b
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
Vincent van
Raveste
i
j
n
b
u
i
l
tin
-
reset: Documen
t
ation update
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
Vincen
t
van Ravesteijn
builti
n
-
branch
:
Fix
c
rash on invali
d
u
s
e of -
-
for
c
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
Jon
a
than Nieder
revert --abor
t
: d
o
n
ot leave behind
usel
e
ss
s
equencer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
Jo
h
anne
s
Sixt
Fix revert --abort on
W
indows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
Nguyễn Thái N
g
ọ
c
Duy
r
e
vert: do not pass
non-
l
iteral string as
f
or
m
at to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
Junio C H
a
mano
Update 1
.
7
.
8 draft relea
s
e
n
otes in preparatio
n
for rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
Ju
n
i
o C H
a
m
ano
Merge bra
n
c
h
'jn/reve
r
t-quit'
commit
|
commitdiff
|
tree
2011-11-23
Jonathan Nieder
revert: remov
e
-
-
r
e
set
compatibility op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
Jonathan Nied
e
r
revert:
i
ntroduce -
-
abort to cance
l
a failed
cherry
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-22
Jo
n
athan Nieder
revert: writ
e
REVE
R
T_H
E
AD pseudo
r
ef during conflicted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-22
Jonathan Nieder
revert: improve error m
e
ssage
f
or che
r
ry-p
i
ck dur
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-22
Jonathan Nieder
revert:
rearrang
e
pick_revisions() for
clarit
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-22
Jonathan Nieder
revert: rename --reset
o
p
tio
n
to --quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-21
J
u
nio C Hamano
Me
r
ge b
r
anch 'jk
/
maint-1
.
6
.
2-upload-ar
c
hi
v
e' into
jk
.
.
.
commit
|
commitdiff
|
tree
2011-11-21
Jef
f
King
archiv
e
: don't
l
et remote clien
t
s get unreachab
l
e
c
ommits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-21
Jeff Kin
g
upload-archive: us
e
st
a
r
t
_
c
omma
n
d inste
a
d o
f
fork
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-21
Juni
o
C H
a
m
ano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2011-11-21
J
u
nio C Haman
o
Merge branc
h
'
r
r
/misc-fixes'
commit
|
commitdiff
|
tree
2011-11-21
R
amsay
J
on
e
s
con
v
ert
.
c:
F
ix
r
eturn typ
e
of git_path_check_e
o
l
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-21
Vincent van R
a
vest
e
i
jn
Show error for 'g
i
t
merge' with uns
e
t
m
erge
.
defaultToUps
t
ream
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-21
Thoma
s
Hochstein
d
ocumen
t
ation fi
x
: git d
i
fft
o
o
l
uses diff t
o
ols, not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-21
Ramsay Jones
co
n
fig
.
c: Fix a stat
i
c buffer o
v
erwrite b
u
g by avo
i
ding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-21
Ramsay Jones
t
5501-
*
.
sh: Fix url
p
assed
to clo
n
e
i
n setup test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-18
Juni
o
C
H
aman
o
Hopefull
y
final update
of re
l
ease notes
b
e
fore 1
.
7
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-18
Junio
C Hamano
Me
r
ge branc
h
'r
r
/
misc-fixes'
commit
|
commitdiff
|
tree
2011-11-18
Jeff K
i
ng
refresh_index:
make po
r
celain output mo
r
e specif
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-18
J
eff
K
in
g
refr
e
sh_index: rename format
varia
b
les
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-18
Jeff King
read-cac
h
e
:
l
et
r
ef
r
esh_cac
h
e_ent
p
as
s
up
c
h
anged flag
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-18
Jonathan Nieder
Makefile: add o
p
t
ion
to
d
i
s
able au
t
o
ma
t
ic dependency
.
.
.
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-18
Junio C Ham
a
no
Sync
with 1
.
7
.
7
.
4
commit
|
commitdiff
|
tree
2011-11-18
Junio C Ha
m
ano
G
i
t
1
.
7
.
7
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-18
Junio C Ham
a
no
M
e
rge branch 'jc/ma
i
n
t
-name-rev-
a
ll' int
o
m
ai
n
t
commit
|
commitdiff
|
tree
2011-11-18
Junio C Hamano
M
e
r
g
e
br
a
nch 'ml/ma
i
l
m
a
p' into
m
aint
commit
|
commitdiff
|
tree
2011-11-18
Junio C Hamano
Me
r
ge
branch
'
j
n/m
a
i
nt-no
t
es-avoi
d
-
v
a
-
args'
i
nto maint
commit
|
commitdiff
|
tree
2011-11-18
Jonathan Nieder
Makefil
e
: add missin
g
header fi
l
e d
e
pendenc
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-18
Jonat
h
an
N
ieder
notes merge: el
i
m
inate OUTPUT
macro
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-17
J
o
nath
a
n Nieder
do not l
e
t git_path clobber
errno when
reporting errors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-17
Junio
C Hamano
G
i
t 1
.
7
.
8
-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-17
J
u
nio C
H
a
mano
pack-ob
j
ect: tolerate broken pac
k
s that have d
u
plicated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-17
Junio C Haman
o
receive-
p
ac
k
, fe
t
c
h
-pack:
r
ej
e
ct bogus p
a
ck
t
hat records
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-17
J
u
ni
o
C Ha
m
ano
r
efs: lo
o
sen over-strict "for
m
at"
check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-17
Mar
c
-André Lureau
m
ailmap: xcalloc mailmap_
i
nfo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-16
R
a
mkumar R
a
mac
h
andra
r
evert: pre
t
tify fatal m
e
ssages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-16
G
ustaf He
n
deby
Add built-
i
n
diff
p
atterns for
M
ATLAB code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-16
Ra
m
k
umar Ramacha
n
dra
git-compat-uti
l
: don't assume value for undef
i
n
ed variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-16
Ramkumar Rama
c
handra
sha1_
f
ile: don't
m
ix enum with in
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next