repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fix some "variable might be used uninitialized" warnings
2011-08-19
Junio
C
Ham
a
no
commit: reduce use of redundant global variabl
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-19
N
g
uyễn Thá
i
Ngọc Duy
log: deco
r
ate
"
re
p
la
c
ed
"
on t
o
replaced c
o
mmits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-19
M
i
cha
e
l J Grube
r
b
ranch
.
c: use the
p
a
rsed
branch name
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguila
r
mer
g
etoo
l
s/meld: Use '--output' when a
v
ail
a
ble
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
A
gui
l
ar
merge
t
ool--l
i
b: Re
f
actor to
o
ls in
t
o separate files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
Ag
u
ilar
merget
o
ol--lib:
Ma
k
e
style consistent
with git
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
dif
f
t
o
o
l--helper: Make sty
l
e c
o
nsistent with git
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-19
Junio C Hama
n
o
Up
d
ate
d
r
aft release notes t
o
1
.
7
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-19
Junio C Hamano
Merge branch 'db/am-skip-blank-at-t
h
e
-
beginning'
commit
|
commitdiff
|
tree
2011-08-19
J
unio C Hamano
Merge branch 'm
a
/
a
m-exclu
d
e'
commit
|
commitdiff
|
tree
2011-08-19
Junio C Hamano
Merge bran
c
h
'
mai
n
t'
commit
|
commitdiff
|
tree
2011-08-18
Jeff King
git_c
o
n
f
ig
_
colorb
o
ol:
r
ef
a
ctor stdout_is_tty hand
l
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
Jeff Ki
n
g
dif
f
: r
e
factor C
O
LOR_
D
I
F
F
from a
fl
a
g
into a
n
int
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
J
e
f
f King
setup_
p
a
g
er: se
t
GIT_PAGER_IN_USE
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
Jeff King
t7006:
u
se test_config help
e
rs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
Jeff King
tes
t
-lib: add hel
p
er fu
n
ct
i
ons for co
n
fig
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
Jeff King
t7006: modernize c
a
ll
s
t
o
unset
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
Fr
e
dr
i
k
Kui
v
inen
Make
f
ile: Use
c
om
p
uted head
e
r dependenci
e
s
i
f
th
e
c
ompiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
Ng
u
y
ễn Th
á
i Ngọc Duy
fetch-pack: ch
e
ck for valid
c
o
m
mit from se
r
ver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
N
guyễn Thái Ngọc
D
uy
log: decorate gra
f
t
e
d commits
wi
t
h "grafted"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
Nguyễn Th
á
i Ngọc Duy
Move
w
rite_shallo
w
_commit
s
to fetch-pac
k
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
N
guyễn Thái Ngọc Duy
Add f
o
r_
e
ach
_
commi
t
_graft()
to iterate all gr
a
fts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
Nguyễ
n
Thái Ngọc Duy
decoratio
n
:
do not mis-
d
ecorate r
e
fs with s
a
me prefix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
J
u
n
i
o C
Hamano
Update
draft rele
a
s
e
notes to 1
.
7
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
Ju
n
io C Hamano
Merge
b
r
a
nch 'mh/check-attr-relati
v
e'
commit
|
commitdiff
|
tree
2011-08-18
J
u
n
i
o C
Hamano
Merge branch 'js/bise
c
t-no-checkout'
commit
|
commitdiff
|
tree
2011-08-18
Junio C Hamano
Merge branch
'rc/histogram-diff'
commit
|
commitdiff
|
tree
2011-08-18
Junio C Hamano
M
erge branch 'jc/
m
aint-smart-ht
t
p-race-upload-pack'
commit
|
commitdiff
|
tree
2011-08-18
J
u
nio C Hamano
M
erge
b
ra
n
ch '
j
s/sh-styl
e
'
commit
|
commitdiff
|
tree
2011-08-18
J
u
nio
C
H
a
mano
Mer
g
e b
r
a
n
c
h 'js/ref-na
m
espaces'
commit
|
commitdiff
|
tree
2011-08-18
Jun
i
o C Haman
o
Merge b
r
anch 'cb/maint-quie
t
-
p
ush'
commit
|
commitdiff
|
tree
2011-08-18
Junio C Hamano
Me
r
ge branch 'jc/maint-com
b
ined-diff-work-tr
e
e'
commit
|
commitdiff
|
tree
2011-08-18
Junio C Hamano
Mer
g
e bran
c
h
'
cb/main
t
-exe
c
-error-report'
commit
|
commitdiff
|
tree
2011-08-18
Junio C Haman
o
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2011-08-18
Juni
o
C H
a
mano
M
e
r
ge branch 'rc
/
histogram-
d
iff' into HEAD
commit
|
commitdiff
|
tree
2011-08-18
T
a
y Ray Chuan
x
diff/x
p
repare: improve O(n
*
m)
p
er
f
ormanc
e
in xdl_cleanup_
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-17
Dmitry Iv
a
nkov
doc/
f
ast-imp
o
r
t: document feat
u
r
e
i
mport
-
mark
s
-i
f
-exists
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-17
Nguyễ
n
Thái Ngọc Duy
c
h
e
ckout-ind
e
x: remove
o
bsole
t
e
c
omment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-16
Junio
C
Haman
o
S
ync with "maint"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-16
Ju
n
io C Hamano
M
erge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2011-08-16
Jonathan Nieder
me
r
g
e
-recu
r
sive
:
t
a
k
e advanta
g
e
of h
a
r
d
coded empty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Prepare for 1
.
7
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-16
Junio C Ham
a
no
Me
r
ge branch 'jk/
t
ag-l
i
st-mul
t
iple-p
a
tterns' into maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Merge branch 'jl/submodule-update-
q
uiet
'
into ma
i
n
t
commit
|
commitdiff
|
tree
2011-08-16
J
u
nio
C Hamano
M
e
rge branch 'jl/
s
ubmodul
e
-ad
d
-relur
l
-wo
-
upstream'
.
.
.
commit
|
commitdiff
|
tree
2011-08-16
Juni
o
C Hamano
M
e
rge
branch 'oa/pul
l
-reflog'
i
nto maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Merge
branc
h
'js/ls-tree-error' into maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Ha
m
ano
M
erge
b
ranch 'jk/fast-export-
q
u
ote-path' int
o
maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Me
r
ge branch '
j
c/check
o
ut-reflog-fix' into maint
commit
|
commitdiff
|
tree
2011-08-16
J
u
nio C Ha
m
ano
M
erge branch 'jc
/
maint-reset-unmerged-path' int
o
maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Ham
a
n
o
Mer
g
e br
a
nch 'mz
/
doc-rebase-abort
'
into ma
i
nt
commit
|
commitdiff
|
tree
2011-08-16
Juni
o
C Hamano
Merge bra
n
ch 'bw/log-all-ref-updat
e
s
-doc' into maint
commit
|
commitdiff
|
tree
2011-08-16
Junio
C
Hamano
Merge branc
h
'j
s
/maint-
a
dd-path-st
a
t
-pwd' into
m
aint
commit
|
commitdiff
|
tree
2011-08-16
Junio
C
Hamano
Merge branch 'ms/
h
elp
-
unknown' into maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Merg
e
branc
h
'mz/doc-syn
o
p
s
is-verse' in
t
o m
a
int
commit
|
commitdiff
|
tree
2011-08-16
J
unio C H
a
mano
Merge br
a
nc
h
'j
n
/mime
-
type-with-param
s
'
into
ma
i
nt
commit
|
commitdiff
|
tree
2011-08-16
J
u
nio
C
H
a
m
ano
Mer
g
e branch 'jc/s
u
b
m
odule-sync-no-auto-vivify'
into
.
.
.
commit
|
commitdiff
|
tree
2011-08-16
Junio
C Hamano
Merge branch
'jc/zlib-wrap' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-08-16
Jun
i
o C Hamano
M
e
rge branch 'fk/r
e
link-upon-ldfl
a
g
s-upd
a
te' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Mer
g
e
branch 'bc/sub
m
od
u
le-fo
r
each-
s
t
din-
f
i
x-1
.
7
.
4
.
.
.
commit
|
commitdiff
|
tree
2011-08-16
Ju
n
io C Hamano
M
e
rge
b
ranch 'aw/r
e
base-i-p' into maint
commit
|
commitdiff
|
tree
2011-08-16
Ju
n
io C Haman
o
M
erge branch
'
jc/diff
-
index-quick-
e
x
it-early
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hama
n
o
M
erge
branch 'jk/combine-di
f
f-bina
r
y-e
t
c' into maint
commit
|
commitdiff
|
tree
2011-08-16
Jef
f
King
am: ref
r
esh the
index at start and --resolved
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-16
Jo
n
athan Nieder
reve
r
t: plug memory leak in "cherry-pick root commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Michae
l
Ha
g
gerty
Unroll the loop over passes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Michael
Hagge
r
ty
Change
wh
i
le lo
o
p into
f
or loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Mich
a
el Haggerty
D
e
te
r
mine the s
t
ar
t
of
t
he stat
e
s
outside of th
e
pa
s
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Michael Hagger
t
y
Change par
s
e_attr() to tak
e
a pointer to struct attr_state
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
M
i
chael Haggert
y
In
c
reme
n
t nu
m
_attr in pa
r
se_attr_line(), not parse_a
t
tr()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
M
i
chael Haggerty
Docu
m
ent struct match_attr
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Michael Haggerty
Add a file
c
omment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Dmitry Ivankov
fas
t
-import: p
r
event produci
n
g bad delta
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Dmitry Ivank
o
v
fast-
i
mpor
t
: add a test
for tree delta base
c
orruptio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge-recursi
v
e: Don't r
e
-
s
ort a list whose
orde
r
w
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
mer
g
e-recursive: F
i
x virtu
a
l
me
r
ge base fo
r
r
e
na
m
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t
6
036
:
criss-cros
s
+ rename/rename
(
1
to2)/ad
d
-de
s
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge
-
recur
s
i
v
e: A
v
oid unn
e
cess
a
ry file rewrites
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ij
a
h Newren
t6022: Additi
o
nal tests checking
f
or
u
nnecessary updat
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
merge-re
c
u
r
siv
e
: Fix spurious 'refusing to lose untrack
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
022: Add testcase
for spurious "ref
u
sing to lose
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Jeff King
t3030: fix accidental succes
s
i
n
s
ymlink rename
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recu
r
sive
:
Fi
x
working copy handl
i
ng f
o
r rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
m
erge-recursive: add handling for rena
m
e/rename/add
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-
r
ecursiv
e
:
H
ave co
n
f
l
ict_r
e
nam
e
_delete
r
eu
s
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-re
c
ursive: M
a
ke modify/
d
elete ha
n
d
lin
g
code re
u
sable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
N
ewr
e
n
me
r
ge-recu
r
sive
:
C
onsider modificati
o
ns in rename/rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-
r
ecurs
i
ve: Create function for merging wi
t
h
bra
n
chname
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
m
erg
e
-recursive
:
Record mor
e
d
at
a
n
e
eded for merging
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
New
r
en
m
e
rge-
r
ecursive:
D
efer rename/rename(2
t
o1)
handling
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recu
r
sive: Small
c
leanups for c
o
nflict_rename_rename_1to2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
merge
-
recu
r
si
v
e: F
i
x
rename/rename(1to2) resolution
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
Newren
mer
g
e-recursive: Introd
u
ce a
m
erge_
f
ile convenience
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newre
n
merge-recur
s
i
ve: Fix modify/delete
r
esolution in the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
r
en
mer
g
e-recur
s
ive: When we det
e
ct
w
e can skip an update
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-re
c
ursive: Provide
m
o
r
e
info in con
f
lict mark
e
rs
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-
r
e
c
ursive: Cleanup an
d
c
onsolidation of rename_conflic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-recursive:
C
o
n
so
l
id
a
te process_entry()
a
n
d
p
r
oce
s
s_df_
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lija
h
Newren
merge-recurs
i
ve
:
Impro
v
e
h
andli
n
g
of rename
target
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
merge-r
e
cur
s
ive: Add comments about handli
n
g rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next