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
Merge git://repo.or.cz/git-gui
2010-01-20
Junio C
H
am
a
no
M
erg
e
branc
h
'bg/main
t
-remote-up
d
ate-default' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'sb/maint-octopus'
i
nto maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'bg/maint-add-
a
ll-d
o
c
'
into m
a
int
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge branch 'm
a
int-1
.
6
.
5'
i
nt
o
mai
n
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Gi
t
1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
ni
o
C
H
aman
o
Merg
e
branch '
j
k/m
a
i
n
t-
1
.
6
.
5-reset-hard'
i
nto maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge b
r
anch 'tr
/
main
t
-1
.
6
.
5-bash-prompt-
s
how-submo
d
ule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io
C
H
a
mano
Merge branch
'
dp/maint-1
.
6
.
5-fast-im
p
ort-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
Hamano
Mer
g
e b
r
anch 'jm/m
a
int-1
.
6
.
5-gre
p
-NUL-terminate' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Haman
o
Teach
@
{upstream}
s
yntax to str
b
u
f_branchanme(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hama
n
o
t
1506: more test for @{upstream} sy
n
t
a
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Fix "checkout
A
.
.
.
" syn
o
nym for "check
o
u
t A
.
.
.
HEAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C Haman
o
status: don
'
t
require the repository t
o
be writable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
M
e
rge bran
c
h 'maint
'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Me
r
ge branch 'maint-1
.
6
.
4
' into
m
a
int-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Mer
g
e
br
a
n
c
h 'maint-1
.
6
.
3' into
ma
i
nt-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Merg
e
br
a
nch 'maint-1
.
6
.
2' into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Merge commit 'v1
.
6
.
4
.
4-8-g8
d
e6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Fix m
i
s-b
a
ckpo
r
t of t7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Update draft release no
t
e
s
to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
n
o
Merge b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
Update
d
ra
f
t
r
elease note
s
to 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Merge branch 'dp/m
a
int-1
.
6
.
5-fast-impo
r
t-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'jc/re
r
ere'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merg
e
branch 'p
c
/unint
e
resti
n
g-submodule-disa
p
pear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
branch 'nd/include-termios-for-
o
s
ol'
commit
|
commitdiff
|
tree
2010-01-19
J
uni
o
C Hamano
Merge branch 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Me
r
ge b
r
anch 'jm/maint
-
1
.
6
.
5-gr
e
p-NUL-termin
a
te' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io
C
Hamano
sy
m
links
.
c
:
rem
o
ve
unused functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C Hamano
object
.
c: remove unused functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Document th
a
t me
r
ge strategies can now take
th
e
ir o
w
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
man
o
Make
"su
b
tree" part more orthogona
l
t
o
the rest of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
pul
l
: Fix p
a
rsing of
-
X<opti
o
n>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Hamano
U
p
da
t
e draft release
notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Me
r
g
e
b
r
anch
'
tc/test-locate-htt
p
d'
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
ma
n
o
Merge branch '
j
h/commit-statu
s
'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
Me
r
ge branch 'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'jc/maint
-
1
.
6
.
1-checkout-
m
-cust
o
m-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge br
a
n
c
h
'tc/clone-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Ham
a
no
Merge branch 'tc/
s
mart-http-re
s
t
r
ict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Merge
b
ra
n
ch 'jk/run-c
o
mmand-use-s
h
ell'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Ham
a
no
Me
r
ge branch 'sr/
g
fi
-
op
t
ions'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
a
no
Upda
t
e CO
P
YI
N
G
with GPLv2 with
new FSF add
r
ess
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
use
r
_ident
_
sufficiently_given()
:
refactor the lo
g
ic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
n
o
u
ser_ident_suff
i
cient
l
y_given():
refactor the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
a
no
rerere:
h
o
no
r
conflict-marker-size attribu
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Ham
a
no
rerere: prepare for c
u
stomizable
c
onflict marker
length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
com
m
it
.
c::pr
i
nt_s
u
mmary
:
do not relea
s
e
t
he format
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Ha
m
a
n
o
con
f
lict-mark
e
r-size: new at
t
ribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C H
a
ma
n
o
rer
e
re: use ll_merge()
i
nstead of using xd
l
_m
e
rge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
merge-tree: use ll_merge() no
t
x
d
l_merg
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
un
i
o C Hamano
xd
l
_mer
g
e()
:
all
o
w passi
n
g dow
n
mar
k
er_size i
n
xmparam_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
xdl_m
e
rge(): introduce xmparam_
t
for
m
erge
specific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
git_attr(): fix fu
n
cti
o
n signature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Me
r
ge b
r
anch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'cc/res
e
t-more'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
T
e
ach diff that modif
i
ed submodu
l
e direct
o
ry is
dirty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Junio
C
H
amano
g
rep --no-
i
n
dex
:
allow us
e
of "git gr
e
p" outside a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
J
u
nio C Ha
m
ano
grep
:
prepare to run outside of a
w
o
rk tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
a
m
ano
Merg
e
br
a
n
c
h 'jc/checkout-mer
g
e-base'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
i
o
C Hama
n
o
Merge branch 'rs/maint-
a
r
c
hive-match-pat
h
spec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ha
m
ano
Merge branch 'il/vcs-hel
p
er'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
strb
u
f_addbuf(): allow passin
g
the sa
m
e buf to
d
st
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C H
a
m
a
no
Merge bra
n
ch 'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Haman
o
Me
r
ge branch
'nd/sparse'
commit
|
commitdiff
|
tree
2010-01-13
Junio C H
a
man
o
t75
0
2: test commit
.
st
a
tus, --status and --no-status
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C Hamano
g
r
ep
:
rip out pessimiza
t
ion to use fixmatch(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
J
unio C Hamano
grep
:
rip out support
f
or external grep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
strb
u
f
.
c: rem
o
ve unused fun
c
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
Ham
a
no
sha1_file
.
c: r
e
move unused functi
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
mailmap
.
c:
r
emove unuse
d
function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C
Hamano
utf8
.
c: ma
r
k f
i
le
-
loca
l
funct
i
on static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
s
ubm
o
dule
.
c: m
a
rk
f
ile-local function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C H
a
m
ano
qu
o
t
e
.
c:
mark
file-local fu
n
ction static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C Hama
n
o
remote
-
curl
.
c: mark file-local function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
J
unio C Hama
n
o
read
-
c
a
che
.
c
:
mark file
-
local funct
i
o
n
s stat
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Haman
o
pa
r
se-options
.
c: mark fi
l
e-lo
c
al fu
n
ction static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
Hamano
en
t
ry
.
c: ma
r
k
f
i
l
e-
l
ocal function
static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C
Hamano
http
.
c:
m
ar
k
file-local
f
unctions static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C H
a
m
a
no
Merge
b
r
anch 'j
c
/mai
n
t-
1
.
6
.
4-gre
p
-lookahead' in
t
o jc
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C
Hamano
g
rep
:
optimize built-in
grep by skipping
l
in
e
s th
a
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
H
amano
grep: -L
sh
o
u
ld show
e
mpty files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
pretty
.
c: mark file-
l
ocal function stati
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
builtin-rev-lis
t
.
c: mark file-local
fun
c
ti
o
n
stat
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
bis
e
ct
.
c
: mark fi
l
e
-local functio
n
static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
J
u
nio C Ha
m
a
n
o
re
r
ere
f
orget
p
a
t
h: f
o
rget re
c
orded res
o
lution
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Hamano
rerere
:
refa
c
tor rerere log
i
c t
o
make i
t
i
ndependent
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
J
u
n
i
o
C Hamano
ident
.
c: treat
$
EMAIL as giving user
.
email i
d
enti
t
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
J
u
nio C
Hamano
ident
.
c: c
h
eck expli
c
it ide
n
ti
t
y
for name and e
m
ail
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
M
e
rge bra
n
c
h
'tr/h
t
tp-updates'
commit
|
commitdiff
|
tree
2010-01-10
Junio C
H
aman
o
Merge branch 'jk/maint-1
.
6
.
5-re
s
e
t-
h
ard'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
M
e
rg
e
branch 'jk/push-to-delete'
commit
|
commitdiff
|
tree
2010-01-10
Ju
n
io C Hamano
Merge branch
'
mm/config-path'
commit
|
commitdiff
|
tree
2010-01-10
Juni
o
C Ha
m
a
n
o
M
e
r
g
e branch '
p
m/cvs-en
v
iron'
commit
|
commitdiff
|
tree
2010-01-10
Junio
C H
a
mano
Merge branch 'tr/ma
i
n
t-1
.
6
.
5-
b
ash
-
prompt-
s
how-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-10
Junio
C H
a
man
o
Me
r
ge branch 'bg/maint-r
e
mote-update-default
'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Ham
a
no
Mer
g
e branch 'mm/diag-path-in-tre
e
ish'
commit
|
commitdiff
|
tree
2010-01-10
Juni
o
C Haman
o
Merge b
r
anch 'fc/opt-quiet-gc-reset
'
commit
|
commitdiff
|
tree
2010-01-10
Junio
C
Hamano
M
e
rg
e
branc
h
'
maint'
commit
|
commitdiff
|
tree
next