repo.or.cz
/
git
/
trast.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation/git-merge: document subtree strategy.
2008-03-19
Miklos Vajna
Docum
e
ntation
/
git
-
merge:
d
ocument subt
r
e
e
strategy
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-19
Da
n
iel Barkalow
F
i
x tag following
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-19
Linus Torvalds
Make revision
li
m
iting
m
o
r
e robu
s
t against occasional
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-19
Dani
e
l Bar
k
alow
Fix
t3200 co
n
fig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-19
Da
n
iel Barkalow
Tigh
t
e
n
refspec processing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-19
L
i
nus
Torvalds
Fix possible S
o
laris pr
o
b
l
em in 'che
c
k
o
ut_entry()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-19
Jun
i
o
C H
a
m
a
no
F
i
x
read-tre
e
not to dis
c
a
r
d errors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-19
Junio
C
Hamano
A
d
d tests
t
o catch prob
l
ems
w
ith un-
u
nlin
k
a
ble symlink
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-19
Junio C
Hamano
Test: c
a
tch if
t
r
ash cann
o
t be remove
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-19
Junio
C Hamano
git-m
e
rge-one-file:
fix lo
n
gst
a
nding stupid thinko
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-17
Ju
n
i
o
C H
a
man
o
Merge branch 'jc/makefile'
commit
|
commitdiff
|
tree
2008-03-16
Linus T
o
rva
l
ds
Don't update unchang
e
d me
r
ge entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-16
Eyvind Bern
h
ards
e
n
f
a
st-import: Allow
"reset" to
d
ele
t
e a new branc
h
without
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-16
Ju
n
io C
Hamano
t1000: use
"test_must_fail git frotz",
n
ot "
!
git frotz"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-16
Ju
n
i
o C
H
amano
Update draft release not
e
s
f
or 1
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-16
Juni
o
C Haman
o
R
e
s
urrec
t
git-rerere to co
n
trib/examples
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-16
Jun
i
o C H
a
mano
Me
r
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-03-16
Junio
C Hamano
Start draft ReleaseNo
t
es for 1
.
5
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-16
Junio C Hamano
rebase
-m:
d
o
n
ot t
r
i
g
ger pre-commit v
e
rificati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-16
Junio C
Hamano
Mer
g
e b
r
anch 'master' of git://re
p
o
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-03-15
Junio C
Ham
a
n
o
Red
o
"add test_cm
p
functi
o
n for t
e
st scripts
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
J
un
i
o C Ham
a
no
Merge branch
'jk/
p
ortable'
commit
|
commitdiff
|
tree
2008-03-15
Junio C Hamano
M
erge
b
ranch '
p
y/submodule'
commit
|
commitdiff
|
tree
2008-03-15
Juni
o
C Hamano
Merge bra
n
ch 'db/d
i
f
f
-to-fp'
commit
|
commitdiff
|
tree
2008-03-15
Junio C Hamano
Me
r
ge branch 'c
c
/help'
commit
|
commitdiff
|
tree
2008-03-15
Jo
n
as
F
onseca
s
h
ortlog
:
do
not require to run from i
n
s
i
de a git
r
epositor
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
Junio C Hamano
M
erge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-03-15
Junio C Hamano
f
orma
t
-patch:
g
enerate MI
M
E header as nee
d
ed even when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
J
u
nio C Ham
a
n
o
Merge bran
c
h
'
m
a
i
nt'
commit
|
commitdiff
|
tree
2008-03-15
Jona
s
Fonseca
Make ma
n
page building
q
uiet when DOCBOOK_XSL_172 is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
Bernt
H
ansen
git-new
-
workdir: Sha
r
e SVN meta data b
e
tw
e
e
n
work di
r
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
Li
n
us Torvalds
F
ix
r
e
cent '
u
np
a
ck
_
trees()
'
-related c
h
a
nges bre
a
kin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
Linus Torvalds
rev-
p
a
rse: fix meaning of rev~ vs
rev~0
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
Eric Wong
git-sv
n
:
d
on't blindly append '*' to branch/tag
s
c
o
nfi
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
Jeff King
t6000lib:
r
e-fix t
r
por
t
ability
commit
|
commitdiff
|
tree
2008-03-15
J
u
nio C Hamano
Merge git
:
//git
.
kernel
.
org
/
pub/scm/g
i
tk/gitk
commit
|
commitdiff
|
tree
2008-03-14
Kristian Høgsberg
wt-s
t
atus
.
c: no need for dup()
dan
c
e anymore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-14
Daniel Barkalow
Write diff
o
utput to a file in st
r
uct diff_options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-14
Christ
i
an Coude
r
Documention: web--brows
e
: add info about "brow
s
e
r
.
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-14
Ch
r
isti
a
n
Couder
web--brows
e
: use cus
t
om comm
a
nds defi
n
ed
a
t conf
i
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-14
J
u
nio C Ha
m
ano
Merge b
r
anc
h
'mr/autoconf-fread'
commit
|
commitdiff
|
tree
2008-03-14
Ju
n
io C
H
aman
o
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-03-14
Junio C Hamano
Merge bra
n
c
h 'ph/maint-qui
l
timport' into maint
commit
|
commitdiff
|
tree
2008-03-14
Juni
o
C
Haman
o
read
-
tre
e
() an
d
un
p
ack
_
trees(): us
e
consis
t
e
n
t
limit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-14
J
oh
a
nnes
Schindeli
n
merge-file: ha
n
dle
e
mp
t
y file
s
grac
e
fully
commit
|
commitdiff
|
tree
2008-03-14
Cle
m
ens Buchacher
mer
g
e-rec
u
rsive: handle file mo
d
e changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-14
Ni
c
olas Pitre
p
a
ck-object
s
: p
r
o
p
e
r pack time
stamping w
i
th --max
.
.
.
commit
|
commitdiff
|
tree
2008-03-14
Vineet Kumar
Min
o
r w
o
rdi
n
g cha
n
ges in the keyboa
r
d desc
r
i
ptions
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-14
Junio C Hamano
Docu
m
entation/g
i
t-he
l
p: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Jeff
K
ing
t
7505: use SHELL_PATH in
h
ook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
t
9112: add mis
s
i
ng
#
!/bin/sh
h
ead
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
filte
r
-branch: use $SHE
L
L_PATH in
s
t
ead of 'sh'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
fi
l
t
e
r-branch: don't use xargs -0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
J
e
f
f
King
add NO_
E
XTERNAL_GR
E
P build opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
t6000lib: tr portability fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
J
e
ff
King
t402
0
: don't use gre
p
-a
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
add
test_cmp function
f
or test scrip
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
remove u
s
e
o
f "tail -n 1" and "tail
-
1"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Jeff
K
ing
g
rep
p
o
r
t
ab
i
lity f
i
x: don't use "-e" or "-q"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Je
f
f
K
i
n
g
m
ore tr portability t
e
st script f
i
xes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
t0050: per
l
p
ortability
f
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Johannes Sch
i
ndelin
git fetch: Take '
-
n' to mean '--n
o
-tags'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2008-03-13
Johannes Sc
h
i
ndelin
gc: call "prune
-
-expi
r
e
2
.
w
e
e
ks
.
a
go" by defaul
t
commit
|
commitdiff
|
tree
2008-03-13
Junio C Hama
n
o
Document
a
tion/co
n
fig:
t
ypo
f
ix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Chri
s
tian Couder
hel
p
: w
a
rn if sp
e
cified 'man
.
viewer' is unsupp
o
rted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
C
hristian Couder
Docume
n
tation: help:
e
xplai
n
'
man
.
viewer' mul
t
ip
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Jef
f
King
tr portability fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Junio C Haman
o
quiltimport: f
i
x misquoting of parsed
-
p
<num> paramet
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
M
arc-Andre Lurea
u
git-cvsimpor
t
: fix merging
w
i
th
r
emote pare
n
t branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Jakub Nare
b
ski
g
i
tweb: Fix b
u
g in
hr
e
f
(
.
.
.
, -replay=>1) when using
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Junio C Hama
n
o
Makefil
e
: flatt
e
n enumeration of headers
,
o
bjects a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Junio C H
a
mano
Makefile:
D
IF
F
_OBJS is not special a
t
all these days
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Johanne
s
Sixt
g
i
t-submodule summ
a
ry: fix that some "wc" flavors produce
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Ping Yin
git-
s
ubmodule summa
r
y: test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Ping
Y
in
git-submodule summary:
d
o
c
umentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Ping Yin
git-
s
ubmodule summ
a
ry: limit summary
s
ize
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Ping
Y
in
git-subm
o
d
u
le s
u
mma
r
y: show
c
o
m
m
i
t sum
m
ary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Christian Couder
help: imple
m
ent mul
t
i-valued "man
.
vie
w
er" config o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Christian Couder
Document
a
tion: help: d
e
scribe 'man
.
v
i
e
w
er'
c
o
nfi
g
variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Ch
r
isti
a
n Couder
help: a
d
d
"
m
an
.
viewe
r
" config var to u
s
e
"
woman" or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Junio C Hamano
M
e
rge git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-03-12
J
u
n
i
o
C
H
amano
Mer
g
e
bran
c
h
'
js/remote'
commit
|
commitdiff
|
tree
2008-03-12
J
u
ni
o
C Hamano
M
e
rge
b
ranch 'lt/un
p
a
c
k-trees'
commit
|
commitdiff
|
tree
2008-03-12
Samuel
T
ardieu
"remote upda
t
e": p
r
in
t
remote name being fetched from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Junio
C
H
aman
o
Merge bran
c
h '
m
aint
'
commit
|
commitdiff
|
tree
2008-03-12
Ma
r
c-Andre Lure
a
u
git-svn: fix find-rev error m
e
s
s
a
ge when missin
g
arg
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
J
e
ff King
t0021: tr p
o
rtability fix for Solaris
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Pin
g
Yin
git-submodule su
m
ma
r
y: code fra
m
e
w
ork
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Johanne
s
Sc
h
indelin
l
a
unch_
e
ditor(): allow spaces
i
n the filename
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Mike Hommey
git re
b
ase --abor
t
:
always restore th
e
ri
g
ht c
o
mmit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-11
M
i
chal R
o
kos
autoconf:
T
e
st FREAD_REA
D
S_DIRECTORIE
S
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-11
Junio C Hamano
M
er
g
e branch 'jc/cherry
-
pick
'
(early part)
commit
|
commitdiff
|
tree
2008-03-11
Junio C Hamano
Merg
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-03-11
Junio C
Hamano
M
e
rge br
a
nch
'
kb/main
t
-filter-branch-dis
a
ppear
'
into
.
.
.
commit
|
commitdiff
|
tree
2008-03-11
J
unio C Hamano
Merge b
r
a
n
ch 'aw/maint-shortlog-blank-lines' into ma
i
nt
commit
|
commitdiff
|
tree
2008-03-11
Li
n
us To
r
va
l
ds
u
npack_
t
re
e
s(
)
:
fix
d
iff-in
d
e
x regression
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-11
SZEDER Gábor
update 'git rebase
'
documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-10
Ju
n
io C Ha
m
ano
t
r
a
v
er
s
e_tree
s
_rec
u
rsive
(
): propagate mer
g
e errors
u
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-10
Junio C H
a
mano
gi
t
-pull documen
t
atio
n
: warn about the
option orde
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next