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 'vr/git-merge-default-to-upstream'
2011-12-05
Junio C
H
a
mano
Merge
b
ranch
'
vr/git-merge-de
f
a
ult-to-upstream'
commit
|
commitdiff
|
tree
2011-12-05
Ju
n
io C
Hamano
Merge branc
h
'jc/maint-pack-o
b
j
ect-
c
ycle'
commit
|
commitdiff
|
tree
2011-12-05
Junio
C Hamano
Merge b
r
anch 'jc/ind
e
x-p
a
c
k-reject-
d
ups'
commit
|
commitdiff
|
tree
2011-12-05
Juni
o
C Hamano
Merge
branch 'vr/msvc
'
commit
|
commitdiff
|
tree
2011-12-05
Jun
i
o C Haman
o
Me
r
g
e
br
a
nch 'na/strtoimax'
commit
|
commitdiff
|
tree
2011-12-05
Juni
o
C
H
ama
n
o
M
erge branch
'ab/cl
a
ng-lints'
commit
|
commitdiff
|
tree
2011-12-05
J
unio C
Hama
n
o
Merg
e
br
a
nch 'nd/prune-progress'
commit
|
commitdiff
|
tree
2011-12-05
Jun
i
o C Hamano
Merge branch
'
n
d/
f
s
c
k-pr
o
gress'
commit
|
commitdiff
|
tree
2011-12-05
Junio C Hamano
M
erge branch
'mf
/
curl-
s
elect-fdset'
commit
|
commitdiff
|
tree
2011-12-05
Junio C Hamano
Merge branc
h
'nd/misc-cleanups'
commit
|
commitdiff
|
tree
2011-12-05
Junio C Hama
n
o
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2011-12-05
J
uni
o
C Hama
n
o
M
erge branch 'm
a
i
nt-1
.
7
.
7' i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-12-05
J
u
nio C H
a
m
a
no
Merge branch 'maint-1
.
7
.
6' into maint-
1
.
7
.
7
commit
|
commitdiff
|
tree
2011-12-05
J
e
ff Kin
g
stri
p
space
:
fix
o
utdated comme
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-05
Pet
e
W
yckoff
git-p4: introduce skipSub
m
itEdit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-05
S
e
ba
s
tian Morr
Ad
d
MYMETA
.
y
ml to perl/
.
g
it
i
gnore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-05
Juni
o
C Hamano
M
erg
e
branch 'js/m
e
rge-edit-option'
commit
|
commitdiff
|
tree
2011-12-05
Jack Nagel
D
ocumentation: fix formatting erro
r
in merge-o
p
t
i
ons
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-02
Junio C Hamano
Git 1
.
7
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-28
Junio C Hamano
Git 1
.
7
.
8-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
Vincent van Ravesteijn
b
u
iltin
-
reset: Documentation update
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
V
incent van Ra
v
esteijn
bu
i
ltin-branc
h
: Fix
cra
s
h on invalid use of --
f
orce
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
Jonathan
N
ieder
revert --abort
:
d
o not leave be
h
ind useless
s
equencer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
Johannes Sixt
Fix re
v
er
t
--abort o
n
W
i
ndows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
Nguyễn
Thái Ng
ọ
c Duy
revert
:
do not pass
n
on-litera
l
s
tring as f
o
rmat t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
J
unio
C
Hamano
Update 1
.
7
.
8 draft
r
e
l
e
ase no
t
es in p
r
eparation
f
or rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
Junio C Haman
o
Merge branch
'jn/re
v
ert-quit'
commit
|
commitdiff
|
tree
2011-11-23
J
o
nathan N
i
eder
revert: remove
--
r
e
s
et compatibilit
y
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
J
onat
h
an
N
ieder
revert: introduce
--ab
o
rt to cance
l
a failed cherry
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-22
Jonathan
N
i
e
d
er
revert:
w
r
ite REVERT_
H
EAD pseudoref du
r
in
g
con
f
licted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-22
J
o
natha
n
N
ie
d
e
r
revert
:
imp
r
ove error message for che
r
ry-pick
d
u
r
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-22
Jona
t
han Nieder
rever
t
: rear
r
ange pick_revisions() for c
l
arity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-22
Jonathan Niede
r
revert: rename --reset
o
p
t
ion to --quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-21
Junio
C
Hamano
Merge branch '
m
a
int'
commit
|
commitdiff
|
tree
2011-11-21
Juni
o
C
H
amano
Merge branc
h
'rr/
m
isc-fixes'
commit
|
commitdiff
|
tree
2011-11-21
Ramsay Jo
n
es
c
onvert
.
c:
F
i
x return type
of
git_
p
ath
_
check_
e
ol()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-21
Vi
n
cent
van Ravesteijn
Show
e
r
r
or for 'git merge' with uns
e
t
m
er
g
e
.
defaultToUpstream
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-21
Thomas
Hochstein
d
ocument
a
t
ion fix: git diffto
o
l uses
d
i
f
f
tools
,
no
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-21
R
a
ms
a
y
Jones
config
.
c: Fix
a
static buffer ove
r
wr
i
te bug by
avoi
d
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-21
R
amsa
y
Jones
t5501-*
.
sh:
Fix url passed to clone
i
n se
t
up test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-18
Ju
n
io C Ha
m
ano
H
opefully final u
p
d
ate
of
r
e
l
ease
n
otes
before 1
.
7
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-18
Junio C
H
amano
Merge branch
'
rr
/
misc-fixes'
commit
|
commitdiff
|
tree
2011-11-18
J
o
nathan Nied
e
r
Makefil
e
:
add o
p
tion to disab
l
e au
t
omat
i
c
d
e
pendency
.
.
.
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 Haman
o
Sync wit
h
1
.
7
.
7
.
4
commit
|
commitdiff
|
tree
2011-11-18
Jun
i
o C Hamano
Git 1
.
7
.
7
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-18
Junio C Hama
n
o
M
e
rge bra
n
ch
'jc/maint-
n
ame-rev-all
'
int
o
maint
commit
|
commitdiff
|
tree
2011-11-18
J
unio C Hamano
M
erge br
a
nch 'ml/m
a
il
m
a
p
'
into
m
a
int
commit
|
commitdiff
|
tree
2011-11-18
Junio
C
Hamano
M
e
rge
branch
'
j
n
/main
t
-n
o
tes-
a
void
-
va-args' into maint
commit
|
commitdiff
|
tree
2011-11-18
J
onathan Nie
d
e
r
Makefile: add missin
g
h
e
ad
e
r file
d
ep
e
ndencies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-18
J
o
nathan N
i
ede
r
n
o
t
e
s
merge: eliminate OUTPUT macr
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-17
Jonathan Ni
e
der
do not let git_path clobber err
n
o when reporting errors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-17
J
un
i
o C Hamano
Git
1
.
7
.
8-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-17
Junio C Hamano
pack-object: tolerate broken pa
c
ks t
h
a
t
have duplicated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-17
Junio C Ha
m
ano
receive-pack
,
fetch-pack: reje
c
t bogus pack that records
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-17
J
unio C Hamano
r
e
f
s: loo
s
en
o
ver-strict "format"
c
h
e
ck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-17
Marc-André Lureau
mailmap: xc
a
lloc ma
i
lmap_info
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-16
Ramkumar Ramachandra
r
evert: prettif
y
fatal
m
e
s
sa
g
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-16
Ra
m
ku
m
ar
R
a
mac
h
andra
git-c
o
mp
a
t-util: don't assume
value for undefined variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-16
Ramkumar Ramachandra
sha1_file: do
n
't
m
ix enum with
int
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-16
Ramk
u
m
a
r
Ramachandr
a
con
v
ert: don't mix enum with int
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-16
Ramkumar Ramachand
r
a
http: re
m
ove un
u
s
e
d function hex()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-15
Junio C
H
amano
n
ame-
r
ev --all: do not e
v
en
att
e
mpt to descri
b
e
no
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-15
J
unio C
H
am
a
no
Revert "uplo
a
d-archive
:
use s
t
art_command i
n
stead of
.
.
.
commit
|
commitdiff
|
tree
2011-11-13
J
u
nio C Ham
a
no
Git 1
.
7
.
8
-
r
c2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-12
J
u
n
io C Hamano
Merge branch 'ly/m
k
t
r
ee-using-strbuf'
commit
|
commitdiff
|
tree
2011-11-10
Junio C
Hamano
Me
r
ge "Move 'builtin-*'
i
nto a 'builtin/' subdire
c
tory"
commit
|
commitdiff
|
tree
2011-11-10
Ju
n
io
C
Hamano
Merge 'b
u
ild-in
g
i
t-mktree'
commit
|
commitdiff
|
tree
2011-11-10
L
iu Yu
a
n
mktree
:
fix a memory l
e
ak in wr
i
t
e
_tree()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-09
Junio C Hamano
Merg
e
branch 'sn/co
m
plete-bash-
w
o-process
-
subst'
commit
|
commitdiff
|
tree
2011-11-09
SZEDER Gábor
com
p
letion: don'
t
leak variable
f
rom the p
r
ompt into
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-09
Junio C Hama
n
o
U
p
date draft r
e
lease
n
otes to 1
.
7
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-09
Junio C
H
ama
n
o
Merge branc
h
'jc/remote-setbr
a
n
c
hes-u
s
age-fix'
commit
|
commitdiff
|
tree
2011-11-09
J
u
ni
o
C Hama
n
o
Merge branch 'fc/rem
o
te-s
e
t
url
-
u
s
age-fi
x
'
commit
|
commitdiff
|
tree
2011-11-09
Jun
i
o C Hamano
Sync w
i
th 1
.
7
.
7
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-09
J
u
n
io C
H
amano
G
it 1
.
7
.
7
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-09
Junio
C
Hamano
Merge branch 'jc/main
t
-remove-ren
a
m
ed
-
ref'
i
n
to
m
aint
commit
|
commitdiff
|
tree
2011-11-09
Junio C Hamano
Merge
b
ranch 'jm/maint-g
i
tweb-fi
l
ter-forks-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-11-09
Junio C Hamano
Me
r
ge branc
h
'dm/
p
ack
-
objects-updat
e
' into maint
commit
|
commitdiff
|
tree
2011-11-08
Junio C
Hamano
docs: Update
i
n
s
t
all-doc-quick
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-08
Jeff
Ki
n
g
docs: don't m
e
nti
o
n --q
u
iet o
r
--exit-co
d
e in git-log(1)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-08
Jeff King
reach
a
ble
:
p
e
r-object p
r
ogress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-08
Jef
f
King
prune
:
h
andle --progr
e
ss/no-pro
g
ress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-08
Nguyễn Thái Ngọc Duy
prune: show
p
rogress while marking reachable object
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-08
J
u
nio C Hamano
Git 1
.
7
.
8
-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-08
Junio C Hamano
Me
r
ge branch 'ss/bla
m
e-textconv
-
fake-working-tre
e
'
commit
|
commitdiff
|
tree
2011-11-08
Se
b
astian Schuberth
blame
.
c: Properly
i
ni
t
i
alize strbuf
aft
e
r ca
l
ling textconv
_
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-07
Ju
n
io C Haman
o
Me
r
ge branch 'ab/i18n-test-fix'
commit
|
commitdiff
|
tree
2011-11-07
J
unio C
H
a
mano
Merg
e
branch 'sn/http-auth-with
-
netrc-fix'
commit
|
commitdiff
|
tree
2011-11-07
Junio C
H
amano
Merge branch 'pw/p4-apple
d
oub
l
e-fix'
commit
|
commitdiff
|
tree
2011-11-07
Felipe Contreras
r
emote: fix remote set-ur
l
usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-07
J
uni
o
C Hamano
remo
t
e: fix set-branches u
s
age
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-07
Nguyễn Thái Ngọc Duy
fsck: print progress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-07
Ng
u
yễn Thái Ngọc Duy
fsck: a
v
oid reading
e
very object twice
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-07
Nguyễn Thái
N
gọc
D
uy
verify_p
a
ckfi
l
e(): check as man
y
object
as possible
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-07
Nguyễn Thái Ngọc Duy
fsck: return er
r
o
r code when verify_pack() goes wrong
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-06
Ævar Arnfjörð Bjarma
s
o
n
cast variable i
n
call
t
o
free() in
b
uiltin/diff
.
c and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-06
Æv
a
r
Arn
f
jörð Bjarmason
ap
p
ly: get
rid of usel
e
ss
x
< 0 compar
i
son on
a size_t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-06
P
ete Wyckoff
git-p4: ignore ap
p
le
filety
p
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-06
Æv
a
r Arnfjörð Bja
r
m
a
s
o
n
t/t750
8
-status
.
sh: use test_i
1
8ncmp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-06
Ævar Arnfjörð Bj
a
rm
a
son
t/t6030-
b
ise
c
t-porcela
i
n
.
s
h: use test
_
i18ngrep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next