repo.or.cz
/
git
/
git-bigfiles.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add a second testcase for handling invalid strategies in git-merge
2008-07-29
J
u
n
i
o C Hamano
t7001: fi
x
"git mv" test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Ju
n
io C
H
ama
n
o
D
ocumentation
:
cla
r
ify what is shown in "git-ls-files
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
J
u
n
io C Hamano
ls-tree doc
u
mentation:
e
n
han
c
e
n
otes o
n
su
b
di
r
ectory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-28
Junio
C
Ha
m
ano
Allow inst
a
lling in the
t
raditional way
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-28
Jun
i
o
C
Hamano
Allow bu
i
l
ding withou
t
any gi
t
installed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Junio C Hamano
GIT 1
.
6
.
0-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Junio
C Hamano
ma
k
e su
r
e parsed
w
ildcard refspec ends with slash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Jun
i
o C Ham
a
no
Merge git://
r
epo
.
or
.
cz/git-
g
ui
commit
|
commitdiff
|
tree
2008-07-25
Junio C Hamano
Merge b
r
anc
h
'maint
'
commit
|
commitdiff
|
tree
2008-07-25
Junio
C
Ha
m
ano
Documentat
i
on: clarify how t
o
dis
a
ble el
e
ments in core
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Junio
C
Haman
o
Makefi
l
e: fix shell quoting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Junio C H
a
mano
tests:
p
ropagate $(TAR) down from the t
o
plevel Makefile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Jun
i
o C Hamano
Merge branch 'ph/checkout'
commit
|
commitdiff
|
tree
2008-07-24
Jun
i
o C Hamano
Merge branch 'maint
'
into ph/checkout
commit
|
commitdiff
|
tree
2008-07-24
J
u
n
i
o C Hamano
ignor
e
non-e
x
istent refs
in dwi
m
_log
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Jun
i
o
C
Hamano
Documentation:
c
l
a
r
ify
diff --cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio
C
Ha
m
ano
b
ui
l
t
in-branch
.
c: optimi
z
e
-
-m
e
rged an
d
--no-merged
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio
C
H
amano
bu
i
l
tin
-
branch
.
c
:
r
emove unused code
in a
p
pen
d
_
ref
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio C Haman
o
stash s
a
v
e: fix
paramet
e
r handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Junio
C
Hamano
tests: do not rel
y
on e
x
te
r
nal "
p
atch
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Junio C Hamano
Revert
"
m
ake git-status use
a
pager"
commit
|
commitdiff
|
tree
2008-07-21
Junio
C
H
amano
Update m
y
e
-
m
ail address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Ju
n
io C H
a
m
a
no
M
erge
b
ranch 'ap/trackinfo'
commit
|
commitdiff
|
tree
2008-07-21
Ju
n
io
C
Hamano
Merge
bra
n
ch 'jc/rerer
e
-auto
-
more'
commit
|
commitdiff
|
tree
2008-07-21
Jun
i
o C Hamano
M
e
rge b
r
anch 'ns/am-abor
t
'
commit
|
commitdiff
|
tree
2008-07-21
J
u
nio C
H
amano
Merge bra
n
ch
'jc/add-ad
d
r
emove'
commit
|
commitdiff
|
tree
2008-07-21
Juni
o
C
Hama
n
o
"ne
e
ds
u
pdate" conside
r
ed harmful
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
Move re
a
d_in_full() and write_i
n
_
f
ull
(
)
t
o
wrapper
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
L
ink sh
e
ll wit
h
compat laye
r
functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-07-20
Junio
C Hamano
refresh-index: fix bitmask a
s
signment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
J
u
nio C H
a
man
o
git-ad
d
--
a
l
l: documenta
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Junio C Hamano
git-add --all
:
t
e
sts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Juni
o
C Hamano
git-add --
a
ll: add
all files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Junio C Hamano
builti
n
-
a
dd
.
c:
r
e
s
truct
u
re the co
d
e for
m
aint
a
inabili
t
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Hamano
Gettin
g
clos
e
r to 1
.
6
.
0-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
J
u
nio C Ha
m
ano
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-07-19
Junio C Hamano
.
mailmap
u
pd
a
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
J
unio C Hamano
t9001 (send-email
)
:
Do not
use
hardc
o
d
ed /
b
in/sh in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Ju
n
io C Hamano
GIT 1
.
5
.
6
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
J
u
ni
o
C Hamano
Merge branch 'sp/
m
a
int-index-pack'
int
o
maint
commit
|
commitdiff
|
tree
2008-07-18
Junio C
Ham
a
no
h
tt
p
-fetch: do not SEGV after fe
t
ching a bad pack
i
dx
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Ju
n
io C Hamano
rev-list: honor
-
-
q
uiet option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Junio C Haman
o
built
i
n-r
e
mote
.
c
: fix ear
l
i
er "skip
_
prefix()" c
o
n
v
e
r
sio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio
C Hamano
rerere
.
aut
o
update:
c
hange
the message when autoupdate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Haman
o
mailinfo: off-by-one fix for
[
PATC
H
(foobar)] re
m
o
val
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
r
ead
-
c
a
ch
e
.
c:
typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Update d
r
aft rele
a
se notes
f
o
r
1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C
H
aman
o
Merge
b
ranch
'
m
v
/das
h
less'
commit
|
commitdiff
|
tree
2008-07-17
Junio
C Hamano
M
erge branch 'ls/maili
n
fo'
commit
|
commitdiff
|
tree
2008-07-17
Junio C
H
amano
M
erg
e
branch 'sb/dashless'
commit
|
commitdiff
|
tree
2008-07-17
J
unio
C Hamano
Me
r
g
e
b
r
a
nch 'rs/arc
h
i
v
e'
commit
|
commitdiff
|
tree
2008-07-17
J
u
ni
o
C
H
am
a
no
Merge bran
c
h 'ag/blame'
commit
|
commitdiff
|
tree
2008-07-17
Junio C
H
ama
n
o
Merge branch
'rs/r
e
base-ch
e
c
k
out-not-so-qui
e
t'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Merge bran
c
h 'sp/maint-index-pack'
commit
|
commitdiff
|
tree
2008-07-17
Juni
o
C Hamano
Merg
e
branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-07-16
Junio C
H
a
mano
Start prepa
r
ing
1
.
5
.
6
.
4 release not
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Junio C
Hamano
Merg
e
branch 'js/maint-pretty-mailma
p
' into maint
commit
|
commitdiff
|
tree
2008-07-16
Junio C
H
amano
Me
r
ge branch 's
p
/maint
-
bash-completion-optim' into
.
.
.
commit
|
commitdiff
|
tree
2008-07-16
Junio C H
a
m
a
n
o
Merge branc
h
'sp/mai
n
t-pack-me
m
use' i
n
t
o
maint
commit
|
commitdiff
|
tree
2008-07-16
Junio C H
a
mano
Merge branch 'ls/main
t
-ma
i
linfo-pat
c
h
-
label' into main
t
commit
|
commitdiff
|
tree
2008-07-16
Junio C
Ham
a
no
Merge
b
r
an
c
h
'
j
s
/maint-dae
m
on-syslog
'
into mai
n
t
commit
|
commitdiff
|
tree
2008-07-16
Junio C Ham
a
n
o
t/aggrega
t
e-
r
esu
l
ts:
w
hites
p
ace fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Ju
n
io
C
Hamano
Merge branch
'
mv/
m
erge-in-c'
commit
|
commitdiff
|
tree
2008-07-16
J
unio C Hamano
Merge branc
h
'a
g
/rewrite_o
n
e'
commit
|
commitdiff
|
tree
2008-07-16
Junio
C Hamano
Merge
b
ran
c
h 'sp/w
i
n'
commit
|
commitdiff
|
tree
2008-07-16
Junio C
H
amano
Merge
br
a
nch 'js
/
more-win'
commit
|
commitdiff
|
tree
2008-07-16
Junio C Ham
a
no
Merge branch 'js
/
main
t
-pretty-m
a
ilmap'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
Up
d
at
e
draft r
e
l
e
ase notes to
1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Junio C H
a
mano
Me
r
ge gi
t
://repo
.
or
.
c
z/
g
it-gui
commit
|
commitdiff
|
tree
2008-07-15
J
u
nio
C Hamano
Merge
branch 'js/me
r
ge-rr'
commit
|
commitdiff
|
tree
2008-07-15
Jun
i
o C Hamano
M
e
rge bra
n
ch 'sb
/
rerere-lib'
commit
|
commitdiff
|
tree
2008-07-15
Ju
n
io C Hamano
Mer
g
e branch 'ls
/
maint-mailinfo-pa
t
c
h
-label'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Ha
m
an
o
Merge
b
r
a
n
ch 'om/rer
e
re-caref
u
l'
commit
|
commitdiff
|
tree
2008-07-15
J
u
nio C Hamano
Merge bra
n
ch 'jc/branch-merged'
commit
|
commitdiff
|
tree
2008-07-15
Juni
o
C
H
a
m
a
n
o
Merge branch
'
jc/rebase-orig-head'
commit
|
commitdiff
|
tree
2008-07-15
Jun
i
o C Ham
a
no
Merge branch 'sp/maint-bas
h
-completion-optim'
commit
|
commitdiff
|
tree
2008-07-15
Ju
n
io C Hamano
tutorial: cl
a
rify "pu
l
l" is
"fetch + merge"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Junio C Hama
n
o
git-re
b
ase: repo
r
t
checkout
failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Jun
i
o C Hamano
redu
c
e_hea
d
s():
p
rote
c
t from duplicat
e
input
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Junio C Hamano
Update draf
t
r
e
l
eas
e
notes for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Junio C Hamano
Merge
branch 'sp/m
a
int-
b
ash
-
com
p
letion-optim
'
commit
|
commitdiff
|
tree
2008-07-13
Junio C
H
a
m
ano
Mer
g
e branch '
m
aint' to sync with 1
.
5
.
6
.
3
commit
|
commitdiff
|
tree
2008-07-13
Junio C Hamano
GIT
1
.
5
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Junio C Ham
a
n
o
M
erg
e
branch 'p
h
/parseo
p
t-step-blame'
commit
|
commitdiff
|
tree
2008-07-13
Junio C Hamano
Merge branch 'am/s
t
ash-branch'
commit
|
commitdiff
|
tree
2008-07-13
Junio C Haman
o
Merge bra
n
ch 'sg/stash-k-i'
commit
|
commitdiff
|
tree
2008-07-13
Junio C Hamano
Merge branch 'jc/report-trackin
g
'
commit
|
commitdiff
|
tree
2008-07-13
Junio C Ha
m
ano
M
erge branch '
j
s
/
p
i
c
k-root
'
commit
|
commitdiff
|
tree
2008-07-13
Junio C Haman
o
Merge branch
'
a
b/
b
u
ndle'
commit
|
commitdiff
|
tree
2008-07-13
Junio C
H
ama
n
o
Merge branch '
t
r
/a
d
d
-
i-e'
commit
|
commitdiff
|
tree
2008-07-12
Ju
n
io C Hamano
t0004: fi
x
timing bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-10
J
u
nio C H
a
mano
T
each mer
g
e
.
log to "gi
t
-merge" again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-10
Junio
C
Hamano
apply: fix copy/rename
b
reakage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-09
Junio C Ha
m
ano
M
erge branch 'jk/pa
g
er-con
f
ig'
commit
|
commitdiff
|
tree
2008-07-09
Junio C Hamano
Merge branch 'js/ap
p
ly-root'
commit
|
commitdiff
|
tree
2008-07-09
Ju
n
io C
Hamano
Merge b
r
anch 'jc/re
f
l
og
-
ex
p
ire'
commit
|
commitdiff
|
tree
2008-07-09
Junio C Ham
a
no
Merge
b
ranch
'sp/ma
i
nt-pa
c
k
-
m
e
muse'
commit
|
commitdiff
|
tree
2008-07-09
Junio C Hamano
branch
--merged/--no-merged: allow specifying arbitr
a
ry
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-09
Jun
i
o C Hamano
branch -
-
contains: de
f
ault to H
E
AD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next