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
merge-recursive: introduce merge_options
2008-08-31
J
unio C
H
a
m
ano
Merge branch 'm
a
i
nt'
commit
|
commitdiff
|
tree
2008-08-31
Junio C
Haman
o
g
i
tat
t
ributes:
-
crlf is not bin
a
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Ha
m
ano
git
-
apply: Loosen "m
a
tch_beg
i
nni
n
g" logi
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C
H
amano
F
i
x example in git-name-rev docum
e
nt
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
J
un
i
o C Hamano
Merge branch '
s
p/missing-thi
n
-b
a
se' into
maint
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Mer
g
e br
a
nch 'sb/daemo
n
'
commit
|
commitdiff
|
tree
2008-08-30
J
u
nio C Hamano
Me
r
ge branch 'af
/
maint-install-no-handlink' i
n
to m
a
in
t
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
shell
:
do not play duplicat
e
d
definition g
a
me
s
t
o shrink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio
C
Hamano
Merge branch
'
np/verify-pack' i
n
to maint
commit
|
commitdiff
|
tree
2008-08-29
J
u
nio C H
a
mano
Merge b
r
anch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-08-28
Jun
i
o C Hamano
Merge
branch '
m
v/merge-custom
'
commit
|
commitdiff
|
tree
2008-08-28
Junio C Hamano
Merge bran
c
h 'ml/
s
u
b
module'
commit
|
commitdiff
|
tree
2008-08-27
J
u
nio
C Haman
o
Merge b
r
anch
'am/che
r
ry-pick-re
r
ere'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
i
o
C Hamano
Merge branch 'jc/a
d
d-
a
ddremove'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge bran
c
h 'n
p
/verify-
p
ac
k
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Mer
g
e branc
h
'
d
a/submodule-sync'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2008-08-27
Juni
o
C Ham
a
no
ctype
.
c
:
p
rotect t
i
ny C preprocessor c
o
nstants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
J
unio C Ham
a
no
Merge b
r
anc
h
'a
f
/maint-install-no-han
d
link'
commit
|
commitdiff
|
tree
2008-08-27
Juni
o
C H
a
mano
Merge branch 'jc/n
o
-slim-
s
hell'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
M
erge b
r
anch
'
m
aint'
commit
|
commitdiff
|
tree
2008-08-26
Ju
n
io C H
a
mano
daemon
.
c: minor style fixu
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>:
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Juni
o
C
Hamano
R
evert "Build-in "git-shell""
commit
|
commitdiff
|
tree
2008-08-24
Junio C
Hamano
M
er
g
e b
r
anc
h
'jc/no-
s
lim-
s
hell
'
commit
|
commitdiff
|
tree
2008-08-24
Junio C
H
amano
Merge branch 'maint' to sync
with 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
Ha
m
ano
GIT
1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
J
u
nio
C
Ha
m
ano
Mer
g
e b
r
anch
'
ag/maint-com
b
i
n
e-diff-f
i
x' into maint
commit
|
commitdiff
|
tree
2008-08-24
J
uni
o
C
H
amano
Merge br
a
nch 'mv/maint
-
mer
g
e-fix' into maint
commit
|
commitdiff
|
tree
2008-08-24
J
u
nio
C Hamano
t7606
:
fix cus
t
o
m merge tes
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C
Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
merg
e
: fi
x
numerus bugs
a
ro
u
n
d
"t
r
ivi
a
l merge" area
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
unpack_trees():
p
rotect the handcraf
t
ed in-core in
d
e
x
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Juni
o
C Hamano
templates/Makefil
e
:
i
nstal
l
i
s
unnecessary, just use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C Hamano
M
erge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C Hamano
Merge
b
r
anch 'm
l
/
s
u
bmodule-for
e
ach'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merg
e
b
r
anch 'p
m
/log
-
exit-co
d
e'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
Hamano
Merge branc
h
'
s
b
/
c
om
m
it-tre
e
-
mini
l
eak
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Haman
o
Merge branc
h
'pb/reflog-dw
i
m'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C Hamano
Merg
e
bran
c
h
'
jc
/
add-stop-at-s
y
ml
i
n
k'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
a
mano
Merge br
a
nch 'kh/diff-tree'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branch 'mg/c
o
unt-objects'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge bra
n
ch 'mz/push-verb
o
se'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C Hamano
Merge branch 'jc
/
index-e
x
tended-f
l
ags
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Mer
g
e branc
h
'
c
c/merge-base-many
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Me
r
g
e b
r
anch 'j
c
/test-deeper'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C Hamano
Me
r
g
e b
r
anch 'js/par
a
lle
l
-
t
es
t
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Fix "git-merge -s bog
o
"
h
elp
text
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io
C
Hamano
Update
d
r
aft release notes fo
r
1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Ham
a
no
M
e
rge branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio C Hamano
Update draft release
notes for
1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio C Hamano
"git-merge"
:
allow fast-forwardin
g
in a stat-d
i
rty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C
Hama
n
o
c
o
mpletion: fi
n
d
out supported
merge
s
trategies co
r
rectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
for-each-r
e
f: cope with tags with incompl
e
te lin
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
diff --check: do
n
ot g
e
t conf
u
sed b
y
new
b
lank lines
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio
C H
a
mano
Build-in "git-shell"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
M
e
rge branch 'bd/diff-strbuf'
commit
|
commitdiff
|
tree
2008-08-20
Junio C
H
a
m
a
n
o
Mer
g
e bran
c
h 'd
p
/
h
ash-liter
a
l
l
y'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge branc
h
'js/checkout-dwim-
l
ocal'
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o C
Hama
n
o
Merge branch 'ph/enable-threa
d
ed'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Haman
o
Merge branch
'
j
k/pager-s
w
ap'
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C Hamano
Merge branc
h
'rs/i
m
ap'
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
i
o C
Hamano
Merge branch 'js/ming
w
-stat'
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C Haman
o
s
hel
l
: do not play d
u
pli
c
ate
d
d
e
finition games to
s
hrink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Juni
o
C Hamano
Merge branch
'
ma
i
nt
'
commit
|
commitdiff
|
tree
2008-08-19
J
unio C Hamano
compat: introduce on_disk_byte
s
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Jun
i
o C Hamano
Start 1
.
6
.
1 cycl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Start 1
.
6
.
0
.
X
main
t
en
a
nce seri
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
GIT 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Merg
e
g
it-g
u
i 0
.
11
.
0
commit
|
commitdiff
|
tree
2008-08-17
Junio C
Hamano
Merg
e
br
a
nch 'ak/p4'
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
tests: use $TEST_DIRECTORY
t
o refer t
o
the t/ d
i
rectory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Jun
i
o C Hamano
index: fut
u
re
p
roof for "extended" index entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
J
u
nio
C
Hamano
Merge gi
t
://git
.
k
er
n
el
.
o
r
g/pu
b
/scm/gitk/
g
itk
commit
|
commitdiff
|
tree
2008-08-14
Jun
i
o C Hamano
xdi
f
f-interface: hid
e
t
h
e whole
"xdiff_emit_stat
e
"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Junio C Hamano
Mer
g
e b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hamano
G
IT 1
.
6
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Junio
C
H
amano
Merge br
a
nch 'maint
'
commit
|
commitdiff
|
tree
2008-08-13
Junio
C
H
amano
Do not talk
a
bout "diff" in rev-list
d
ocu
m
entation
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Jun
i
o
C Ham
a
n
o
Merge git://git
.
bogomips
.
org/git-sv
n
commit
|
commitdiff
|
tree
2008-08-12
J
u
nio C H
a
mano
diff --
c
heck: do no
t
uncondi
t
io
n
ally comp
l
ain a
b
o
u
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Junio
C
Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-08-11
Jun
i
o C Hamano
M
e
r
g
e br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-08-11
Junio C H
a
mano
Re-
f
ix rev
-
list-options do
c
umentat
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
J
u
nio C Hamano
Mer
g
e branch '
m
aint'
commit
|
commitdiff
|
tree
2008-08-11
Ju
n
i
o
C Hamano
Fix
del
e
ting
r
eflog entries from HEAD reflog
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-09
J
u
n
io C Hama
n
o
Upd
a
te draft RelNotes for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-09
Juni
o
C Hamano
Merge br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2008-08-09
Jun
i
o C
Hamano
mailinfo: fix
M
I
ME mul
t
i
-
part message boun
d
ary ha
n
dling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-08
J
u
n
io C Ham
a
no
GIT-VER
S
I
O
N
-GEN
:
mark the v
e
r
s
ion
'dirty' o
n
ly if
there
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-08
Junio C Hamano
asciid
o
c markup fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-07
Jun
i
o C
H
am
a
no
M
erge
branch 'lt/config-fsync' into maint
commit
|
commitdiff
|
tree
2008-08-07
Junio C
H
amano
Merge b
r
anch
'
jc/ref
l
og-ex
p
ir
e
' into maint
commit
|
commitdiff
|
tree
2008-08-07
Juni
o
C Hamano
M
erge branch 'ag/rewrite_o
n
e' i
n
t
o maint
commit
|
commitdiff
|
tree
2008-08-06
Junio C Ha
m
ano
GIT
1
.
6
.
0-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
J
u
n
io C Ham
a
n
o
Sync with
1
.
5
.
6
.
5
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
GIT 1
.
5
.
6
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
Files given on the c
o
mmand
line are rel
a
tive to $cwd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
Junio
C Hamano
Merge git:
/
/r
e
po
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-08-06
Junio
C
Ha
m
ano
Me
r
g
e git://git
.
kernel
.
org/p
u
b
/scm/gitk/gitk
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
Merge
b
ranch
'rs/archive-
p
arse-option
s
'
commit
|
commitdiff
|
tree
next