repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Make git-pull complain and give advice when there is nothing to merge with
2006-09-16
Linus Tor
v
alds
All
o
w
m
ultiple "git_path()" u
s
es
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-09-14
Linus Torvalds
Add "-h/-H"
par
s
ing
t
o "git
gr
e
p
"
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-09-04
Linus Torvald
s
Fix git-
f
s
c
k
-
objects S
I
GSEGV/divide-by-zero
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-08-29
L
inus Torvalds
git
-
fsck-objec
t
s
:
lack
i
n
g
defa
u
lt re
f
eren
c
es
should
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-08-27
Lin
u
s Torvald
s
Relative
timestam
p
s in git lo
g
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-07-31
L
i
nus Torva
l
ds
Fix up som
e
f
a
llout fr
o
m "setup_git_director
y
(
)" cl
e
a
n
u
ps
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-07-31
Linus Torvald
s
Fix dou
b
le "clo
s
e()" in
c
e
_com
p
are_data
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-07-29
L
i
nus Torvalds
Call setup_git_director
y
() mu
c
h ear
l
ier
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-07-29
Linus To
r
valds
Call
setup_
g
it_directory() early
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-07-14
Linus
T
o
r
valds
s
ha1_file:
add the ability
t
o
parse o
b
jec
t
s in "pac
k
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-07-13
Linu
s
Torvalds
Remove TYPE_* co
n
stant macr
o
s and use
o
bject_type
e
nums
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-07-11
L
i
nus Torvalds
Make t
h
e u
n
packed object header functions
stat
i
c to
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-07-09
Linus
T
orva
l
ds
bu
i
ltin "git pru
n
e"
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-07-04
L
i
nus Torvalds
I
m
p
rove git-peek-remote
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-07-02
Linus
T
orvalds
re
v
ision
.
c
:
fix
"
dens
e
"
u
n
d
e
r
--remove-empt
y
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-07-02
Lin
u
s Torvalds
git object hash cleanups
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-07-02
Linus Torv
a
ld
s
revision
.
c: --
f
u
l
l-hi
s
tory fix
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-06-30
Linus
T
orva
l
ds
Abs
t
ract ou
t
a
c
ces
s
es to o
b
ject hash
a
r
ray
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-06-29
L
inus Torvalds
Do not t
r
y
f
uti
l
e
o
bj
e
ct pairs w
h
en
r
epack
i
ng
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-06-29
Linu
s
Torva
l
ds
Improved three-way
b
lob merging
c
o
d
e
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-06-29
Lin
u
s Torvald
s
Prepare "gi
t
-merge-
t
ree" f
o
r fut
u
re work
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-06-29
Lin
u
s Tor
v
al
d
s
xdiff: generate "anti-diffs" aka what is
c
ommon
t
o
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-06-22
Linus Tor
v
a
l
ds
Tweak diff colors
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-06-21
Lin
u
s
T
orvalds
Fix grow
_
refs_hash()
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-06-20
Linus Torva
l
d
s
A
dd "
n
amed
o
bject ar
r
ay" conc
e
pt
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-06-20
Linus Torvalds
Add specialized objec
t
al
l
ocator
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-06-18
Linus Torvalds
Remove "
r
efs" field
from
"
struct object"
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-06-18
Linus Torvalds
Some more memor
y
leak avoidance
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-06-18
Linus To
r
valds
Move
"
voi
d
*u
t
il"
f
rom "struct obje
c
t"
into "struct
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-06-18
Linus To
r
valds
Shrink "struc
t
object" a b
i
t
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-06-17
Linus Torvald
s
gitweb
.
c
gi his
t
ory not shown
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-06-06
Linus
Torvalds
p
a
ck-objec
t
s: improve path
grouping heuri
s
tics
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-06-05
Linus Torvalds
re
v
-list: fix p
r
ocess_tree() conversion
.
commit
|
commitdiff
|
tree
2006-06-05
Li
n
us
T
orvalds
Fix
t
ypo in
t
utorial-2
.
txt
commit
|
commitdiff
|
tree
2006-06-05
Linus
T
orvalds
re
a
d-
t
ree: fix eye-candy
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-31
Lin
u
s
Tor
v
alds
tree_entry(): new tree-walking helpe
r
functio
n
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-30
L
inus Torvalds
R
emove last v
e
stiges
of generic tree_entry_list
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-30
Linus
Torvalds
Co
n
v
ert fetc
h
.
c:
proc
e
ss_tree() to raw tr
e
e walker
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-30
Linus Torva
l
ds
Convert "mark_tree_uninteresting()" to raw
tree walker
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-30
Linus
T
orv
a
ld
s
Remove unused "zeropa
d
"
entry from tree_list_en
t
ry
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-30
Linus
To
r
valds
fsck-objects: avoi
d
unnecessary t
r
ee_entry_list u
s
age
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-30
Linus Torvalds
Re
m
ove "
t
r
ee->entries" tree-ent
r
y
l
ist from t
r
ee parser
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-30
Linus Torv
a
lds
b
uiltin-read-tree
.
c: av
o
id tree_
e
ntry_list in pr
i
me_cache_tr
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-30
Linus
Torvalds
S
w
it
c
h
"
r
ead_tree_recursive()" over
t
o
t
ree-
w
a
l
k functionality
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-30
L
inus T
o
rv
a
lds
Mak
e
"tree_entry" have a SH
A
1 instead
o
f a union of
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-30
Lin
u
s Torvalds
Make "struct
t
ree" contain the poin
t
er to the tree
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-29
Linus Torval
d
s
Remove "tree
-
>entries
"
t
r
ee-ent
r
y list f
r
o
m
tree parser
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-29
Lin
u
s Torv
a
lds
Switch
"re
a
d_tre
e
_re
c
ursive()" over
t
o
tree-w
a
lk functional
i
ty
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-29
Linus Torvalds
Mak
e
"t
r
e
e_entry"
h
ave a
S
HA1
in
s
tead
o
f a union of
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-29
Linus Torvalds
Add
raw tree
buffer info to
"s
t
ruct tree"
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-29
Linus Tor
v
a
l
ds
Do
n
't u
s
e
"sscanf()
"
for
t
ree mode scann
i
ng
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-28
Linus Torvalds
Fix memory leak in
"
g
i
t
rev-li
s
t --
o
bjects
"
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-28
L
in
u
s Torvalds
Fix
"--a
b
b
r
ev=xyz" for
rev
i
si
o
n
list
i
ng
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-28
Lin
u
s Torv
a
lds
t
1
00
2
:
use
-
U0 instead of --
u
nified=0
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-26
Lin
u
s Torv
a
lds
bogus "
f
atal
:
Not a git
reposito
r
y"
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-24
Li
n
u
s
T
orval
d
s
Clean up sha1 file w
r
iting
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-24
Linus
T
o
rvald
s
apply: treat EOF as
p
roper conte
x
t
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-23
Linus Torva
l
ds
c
v
simport:
repack every kilo-c
o
mmits
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-20
Linus Torvalds
Add
bui
l
t
i
n "git rm" comman
d
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-19
L
i
nus Torvalds
Move pa
t
hspec
m
a
t
ching from builtin-add
.
c into dir
.
c
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-19
Linus Tor
v
alds
Libify the i
n
dex refresh
log
i
c
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-18
Linus Tor
v
a
ld
s
Make "git rev
-
list" be a builtin
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-18
Linus
Tor
v
alds
Preven
t
bogu
s
pat
h
s from being added to
th
e
ind
e
x
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-18
Linus
T
or
v
alds
Remove old "git-add
.
sh" remnan
t
s
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-17
L
inu
s
Torvalds
builtin-grep
:
wor
k
ar
o
und f
o
r non GNU grep
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-17
Linus Torvalds
builtin-add: warn on unmatched pa
t
h
s
pecs
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-17
Linus Torvald
s
Do "git add" as a
builtin
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-17
Linu
s
T
or
v
alds
Cl
e
an up git-ls-fi
l
e
directory wa
l
king lib
r
ary inter
f
ac
e
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-17
L
i
nus Tor
v
a
l
ds
l
i
bify git-ls-fi
l
es direc
t
o
ry traversal
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-17
L
i
nus Torva
l
d
s
Remove old "git-grep
.
sh" remna
n
ts
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-16
Linus Torva
l
ds
Fix silly t
y
po in new builtin grep
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-15
Linus T
o
rvalds
r
e
ad-t
r
e
e -
-
reset
-u fix
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-15
Linus Torv
a
lds
builtin-grep: use e
x
t
ernal grep when we ca
n
take advantage
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-14
Linus To
r
valds
Simpli
f
y
"git rese
t
--hard
"
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-14
Linu
s
Torvald
s
Allow
one-w
a
y tree merge to remove
o
ld files
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-14
Linus Torvald
s
git diff:
s
upport "-U" and "--unified" optio
n
s p
r
operly
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-13
Linus Torva
l
ds
git config
s
yntax
update
s
name =
Linus Torvalds
email.torvalds@osdl.org.name ->
Linus Torvalds
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-10
Linus Torvalds
revert/cher
r
y-pick:
use
aggressive merge
.
commit
|
commitdiff
|
tree
2006-05-08
L
i
nus
T
orvalds
Fix "git diff
-
-
stat" with long f
i
lenames
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-04
Lin
u
s Torvald
s
sha1_to_hex(
)
usage cleanup
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-05-03
Lin
u
s Torval
d
s
F
i
x "gi
t
-
l
og --parents"
breakage post v1
.
3
.
0
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-04-30
Linus
T
o
r
valds
gi
t
builtin "push"
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-04-27
L
inus Torvalds
F
ix "
g
it
h
elp -a" terminal autos
i
zing
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-04-26
L
i
nus Torvalds
Fix filen
a
me ver
i
fi
c
ation wh
e
n
in a subdir
e
ctory
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-04-21
Li
n
us Tor
v
alds
Spl
i
t up builtin command
s
into separate files f
r
om
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-04-21
Linus Torvalds
git-log produces no o
u
tp
u
t
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-04-19
Linus Torvalds
git log: do
n
't do merge
d
iffs by d
e
fault
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-04-19
Linus To
r
v
a
lds
Allow "git
repack" users
t
o specify r
e
packing wind
o
w
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-04-19
Linus Torvalds
get_
s
ha1() shorthands
f
or blo
b
/tr
e
e objects
commit
|
commitdiff
|
tree
2006-04-19
Linus Torvalds
Fix
u
n
inter
e
sting tags in new revis
i
on parsi
n
g
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-04-18
Li
n
us Torvalds
Log m
e
ssage pri
n
tout cle
a
nups (#3)
:
f
i
x
--prett
y
=one
l
ine
commit
|
commitdiff
|
tree
2006-04-18
Lin
u
s
Torval
d
s
Log
message prin
t
out cleanups (#2)
commit
|
commitdiff
|
tree
2006-04-17
Linus Torvalds
Log mes
s
age printout cleanups
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-04-16
Linus
Torvalds
Fixes fo
r
option parsing
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-04-16
L
i
nus Torvalds
Tentati
v
e bu
i
l
t-in
"
g
it show"
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-04-16
Lin
u
s To
r
valds
S
u
p
p
or
t
"git
c
md --he
l
p"
s
yn
t
ax
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-04-16
Linus T
o
r
valds
Tentati
v
e built
-
in
"
git show"
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-04-15
Linus
T
orvalds
C
ommon option p
a
rsing
for "git log -
-
diff" and fri
e
nds
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-04-15
L
inus Torvalds
Clea
n
up traili
n
g whitespace
w
hen pre
t
t
y
-prin
t
ing co
m
mits
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2006-04-13
Linus
To
r
valds
Use less memory in "git log"
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
next