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
simplify output of conflicting merge
2009-03-07
Jeff King
t1300: u
s
e test_must_fail as appr
o
pria
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-07
René Scharfe
cle
a
nup: a
d
d isascii()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-07
Christian Co
u
der
Documentatio
n
: fix
badly indente
d
pa
r
a
g
r
a
phs in "-
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-05
John Tapsell
Make the 'lock file'
e
xists error more informa
t
iv
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-04
Junio C
Hamano
Be
g
innin
g
of 1
.
6
.
2 maintenance tra
c
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-04
Junio C Hama
n
o
GIT 1
.
6
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-04
Mich
a
el J Gruber
g
i
t submodule:
F
ix adding
of su
b
modules at pa
t
hs with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-04
Micha
e
l
J Gruber
git submodule:
Add t
e
st cases f
o
r g
i
t submodu
l
e add
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-04
Mike Ra
l
phson
Documentation: Typ
o
/
s
pe
l
l
i
ng / formattin
g
f
i
x
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-04
Mike Ralphson
Documen
t
ation: Expand
a couple of abbreviations
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-04
Mike Ralphson
D
ocumentation: Typos / spelling fixes in RelNotes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-04
Roy Lee
Document
a
ti
o
n/git-arc
h
ive
.
txt: Not
e
attribu
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-03
Thomas Ra
s
t
send
-
email: respec
t
in-repl
y
-to regardless of th
r
eadin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-03
René Scharfe
opti
m
i
z
e
compat/ memmem()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-03
R
e
né Schar
f
e
d
iffcore-pickaxe
:
use memme
m
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-02
David J
.
M
ell
o
r
D
ocume
n
tation
:
m
i
no
r
grammatica
l
fi
x
es
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-02
David
J
.
M
e
ll
o
r
D
ocumen
t
ation: minor gramm
a
tical fixes
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-02
D
avid J
.
Mello
r
Documentati
o
n: minor gr
a
mmatical fixes
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-02
Johann
e
s Sixt
t3
4
00-reb
a
se: Mov
e
detached HEAD c
h
eck earlier
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-02
Ju
n
io C
Hamano
Me
r
ge git://git
.
k
e
rnel
.
org/pub/scm/g
i
tk/gitk
commit
|
commitdiff
|
tree
2009-03-01
Junio
C
Hamano
Merge
b
r
anch 'jc/maint-1
.
6
.
0-p
a
c
k-direct
o
ry
'
commit
|
commitdiff
|
tree
2009-02-28
J
u
n
i
o
C H
a
m
a
no
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2009-02-28
David
J
.
Mellor
Doc
u
mentation: m
i
no
r
gramma
t
i
cal
fixes
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-28
Elijah
Newr
e
n
Ensure prope
r
setup o
f
git_dir for git-hash-object
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-28
Juni
o
C Hama
n
o
M
er
g
e branch
'
m
aint-
1
.
6
.
0' into maint
commit
|
commitdiff
|
tree
2009-02-28
D
a
nijel Taso
v
added missing bac
k
tick in
g
i
t-apply
.
t
x
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-28
Todd Zul
l
inger
g
it-rebas
e
: Update
-
-whitespac
e
documentat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-28
Ben W
a
lton
g
i
t-svn - return o
r
iginal f
o
r
m
a
t_svn_date
s
emantics
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-28
Eric Wong
git-sv
n
: disable broken symlin
k
workaround by de
f
ault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-28
J
u
nio C
H
am
a
n
o
Merge b
r
a
nch 'cc/main
t
-1
.
6
.
0-
b
i
s
ect-fix'
commit
|
commitdiff
|
tree
2009-02-27
Christian Couder
bisec
t
: fix another instance of ev
a
l'ed s
t
ring
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-27
Jun
i
o
C Hamano
Merge b
r
anch 'cc/m
a
int-1
.
6
.
0-bisect-fix'
commit
|
commitdiff
|
tree
2009-02-27
Christ
i
an Couder
bisect: fix quoting TRIED r
e
vs when
"bad"
commit is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-27
Ju
n
io C Hamano
git-am: make -
-
abo
r
t
l
e
ss
da
n
g
e
r
o
us
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-27
Michae
l
J G
r
uber
gi
t
-a
m
:
Keep in
d
ex
i
n
case of abort with dirty inde
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffi
a
n
t5540-http
-
push
.
sh: avoid non-portable
g
rep -P
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-26
Mike Ra
l
phs
o
n
Fi
x
odb_mkste
m
p
(
) on
A
I
X
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-25
Junio
C
Ham
a
n
o
GIT 1
.
6
.
2-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-25
Juni
o
C
H
a
mano
Merg
e
branch
'jc/ma
i
nt-1
.
6
.
0-pack-director
y
'
commit
|
commitdiff
|
tree
2009-02-25
Junio C Hamano
Make
sure objects/pack exists be
f
ore creating a new
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-25
Jay So
f
f
i
an
Allow
HTT
P
tests to run on Darwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-25
Mic
h
ael
J Gruber
Fix
t
ypo in
c
ontrib/examples/git-
s
v
nimport
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-25
Joh
a
nnes
S
ixt
gita
t
tri
b
u
te
s
.
t
x
t: Path matchin
g
rules are explained
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-25
Felipe Co
n
tr
e
ras
sha1_file
.
c: fix
typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-25
Felipe
Contrer
a
s
git add: trivial codestyle cleanup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-25
Chri
s
tian
C
ouder
READM
E
:
fix path to "gitcvs-mi
g
ration
.
txt" an
d
be more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-25
Al
l
an Ca
f
fee
trace: Fixed a
m
ino
r
typo in an error me
s
sa
g
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-25
Marc Branchaud
Docs: Expa
n
d
e
x
p
lanatio
n
of the
u
s
e of + in git p
u
sh
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-25
Gerrit Pap
e
git-quiltim
p
ort: prese
r
ve standard input to
b
e able
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-25
Jef
f
King
never fa
l
lback
relative
t
ime
s
to absolute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-25
G
errit Pape
Instal
l
builtins
w
ith the user and group
of t
h
e
i
n
st
a
lling
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-25
Junio C Haman
o
Mer
g
e git
:
//git
.
bog
o
mips
.
org/git-s
v
n
commit
|
commitdiff
|
tree
2009-02-25
Abhijit
M
enon-Sen
C
o
nve
r
t git-* invo
c
ati
o
ns to "git
*" in the svni
m
p
o
rt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-24
Jay
S
o
f
fian
send-email: don't c
r
e
a
te
temporary compose file un
t
il
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-24
Juni
o
C H
a
mano
Merge gi
t
://git
.
bo
g
omips
.
org/g
i
t
-
svn
commit
|
commitdiff
|
tree
2009-02-23
Pete Wyc
k
off
git
-
p4: avo
i
d
sync
i
ng
duplicate
changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-21
Junio
C
Hamano
M
erge branch 'for-juni
o
' of git:/
/
source
.
wi
n
ehq
.
org
.
.
.
commit
|
commitdiff
|
tree
2009-02-21
Linus To
r
valds
S
u
pport 'ra
w
' date format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-20
Junio C Hamano
M
erge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2009-02-20
Mat
t
h
ieu Moy
More friendly
me
s
sa
g
e when lo
c
king the index
fails
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-20
Matth
i
e
u
M
oy
Document gi
t
bla
m
e --reverse
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-20
Marcel M
.
Cary
gitweb: H
y
perlink multiple gi
t
h
a
shes on the same
c
o
m
m
it
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-20
Johann
e
s Schin
d
elin
sys
t
em_
p
a
t
h(): simplify using
s
t
rip_path
_
suffix(),
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-20
Johannes S
c
hindelin
I
ntroduce the funct
i
o
n
strip_path
_
suffi
x
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-19
To
d
d Zullinger
Doc
u
m
enta
t
ion:
Note file formats send-em
a
i
l
a
ccepts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-18
Junio C Hamano
Merge br
a
nch
'
maint'
commit
|
commitdiff
|
tree
2009-02-18
Junio C Hamano
t
ests
:
fix "e
x
port var=val"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-18
Lars Noschinski
f
i
l
t
er
-
branc
h
-d: Export G
I
T
_DIR earlier
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-18
Jay Sof
f
ia
n
disal
l
ow p
r
oviding multiple upstream b
r
anche
s
to r
e
base
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-18
Michael Spang
Sk
i
p timestamp diffe
r
enc
e
s f
o
r diff
-
-n
o
-index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-18
Junio C
Hamano
git-
a
d
d
-i/-p
:
learn t
o
unwrap
C-quoted pat
h
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-18
J
u
n
i
o C Hamano
g
i
t-svn
:
fi
x
parsing o
f
timestamp ob
t
ained
from
s
vn
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-18
Marcel M
.
Cary
gitweb: Fi
x
warnings with o
v
errid
e
p
e
rmitted but no
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-18
Gerrit
P
ape
Documentation/g
i
t
-push: --all, --mirro
r
, --t
a
g
s
can
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-18
T
homas Rast
bash com
p
letion: only show 'log --merge' if me
r
ging
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-18
Thomas Ras
t
bash complet
i
on: refactor common
l
og, short
l
o
g
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-17
Giuseppe Bilotta
g
itweb: fix wrong
b
ase URL when non-root Di
r
e
c
toryInde
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-16
SZEDE
R
Gábor
bash:
u
pd
a
t
e
'git svn' o
p
ti
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-16
SZED
E
R Gábor
bash: add mis
s
ing 'git merge'
o
p
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-16
Dé
v
ai Tamás
git-svn: Fix for
r
ewriteRoot
U
R
L
containing usern
a
m
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-15
Re
n
é S
c
harfe
builtin-receive
-
pack
.
c
: fi
x
compiler wa
r
n
ings about
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-15
Junio C Hamano
RelNotes Update
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-15
J
u
n
i
o
C
Hamano
Merge bra
n
ch 'mc/s
e
tup-cd-p'
commit
|
commitdiff
|
tree
2009-02-15
Junio C
H
am
a
no
Merge branch 'ff/submodule-no-fetch'
commit
|
commitdiff
|
tree
2009-02-15
Jun
i
o C
H
amano
Merge b
r
anch 'm
s
/m
a
il
m
a
p
'
commit
|
commitdiff
|
tree
2009-02-15
Junio
C Hamano
Merge
b
r
anch 'jn
/
gitweb-com
m
itta
g
'
commit
|
commitdiff
|
tree
2009-02-15
Junio C
H
amano
Mer
g
e bran
c
h 'rc/http-p
u
sh'
commit
|
commitdiff
|
tree
2009-02-15
Tay
R
ay Chuan
use
a hash of the lock token as the s
u
ff
i
x
f
or
P
UT
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-15
Jun
i
o C
H
amano
Merg
e
branch
'
js/gc-prune'
commit
|
commitdiff
|
tree
2009-02-15
Juni
o
C
Ham
a
no
Merge
b
ranch 'tr/
a
bbrev-comm
i
t-no-ellipses'
commit
|
commitdiff
|
tree
2009-02-15
J
u
nio C Ha
m
ano
Merge b
r
a
nch 'jc/branch-previous'
commit
|
commitdiff
|
tree
2009-02-15
Jay Sof
f
ian
send-emai
l
: --sup
p
ress-
c
c im
p
rovements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-15
Jay Soffia
n
s
end-
e
ma
i
l
:
handle multiple Cc addre
s
se
s
when rea
d
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-15
Jay Soffian
send-email: allow send-email
t
o run
o
u
tside a r
e
po
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-15
SZE
D
ER Gábor
bash: fix
m
issp
e
l
led
'
git svn'
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-15
SZEDER
G
á
b
or
t1500:
m
or
e
'g
i
t rev-pars
e
--git-dir' tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-15
SZEDER Gá
b
or
Move 'rev-parse --git
-
dir' test to t1500
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-15
Thom
a
s
Rast
Docu
m
entation: pru
n
i
ng
rec
i
pe for
destructi
v
e fil
t
er
.
.
.
Thanks to Björn Steinbrink and
Junio C Hamano
for comments and
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-15
Johannes Schi
n
delin
gc:
m
a
ke --
p
rune
useful again by accepting an opt
i
onal
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-02-14
Junio C H
a
m
ano
Teach @{
-
1
} to git merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next