repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
user-manual: Document that "git merge" doesn't like uncommited changes.
2009-11-23
Matth
i
eu M
o
y
user-manu
a
l
: D
o
cument
t
hat "g
i
t merge" doesn't like
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu Mo
y
merge-recursive: p
o
int the user to c
o
mmit wh
e
n file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-10
Junio C Ha
m
ano
GI
T
1
.
6
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-10
Simon Arlott
git-
s
vn:
h
i
de find_parent_branch output
i
n doubl
e
quiet
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-10
Jonathan Nieder
Document
a
tion: clone: clarify discussion o
f
in
i
ti
a
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Junio C Hamano
M
e
rge branch 'rs/maint-arc
h
ive-pr
e
fix'
commit
|
commitdiff
|
tree
2009-10-09
Junio C Hamano
M
e
rge branch 'fc/
m
utt-a
l
ia
s
'
commit
|
commitdiff
|
tree
2009-10-09
Juni
o
C Ha
m
ano
Merge branch 'e
f
/msvc-noreturn'
commit
|
commitdiff
|
tree
2009-10-09
J
u
nio C Ha
m
a
no
Merge
b
ranch 'jk/
r
eflog-
d
ate'
commit
|
commitdiff
|
tree
2009-10-09
J
u
nio
C
Ham
a
n
o
Merge branch
'
ch/am-hea
d
er'
commit
|
commitdiff
|
tree
2009-10-09
Björn Gustavsson
bas
h
: add support for
'
git
r
eplace'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Stephen Boyd
comp
l
etion: fix al
i
as listings with newlines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
S
tephen Bo
y
d
complet
i
on: f
i
x comple
t
ion of g
i
t
<TAB>
<
TAB>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
I
ngmar Vanhass
e
l
imp
o
rt-tars: Add missin
g
closin
g
bracke
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan Nieder
racy-git
.
txt: expl
a
in n
s
ec
p
roble
m
in more
detai
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan Nieder
Documentation: clar
i
fy "working tree" definition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan N
i
eder
Documentat
i
on: clar
i
fy br
a
nch creation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan Nieder
D
o
cumentation: bran
c
h: update
--me
r
ged description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan
N
ieder
Doc
u
mentati
o
n: c
l
a
rify m
e
rge
o
ption
s
de
s
cription
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan
N
i
ede
r
Docum
e
ntation: git fmt-merge
-
msg does not have to be
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Jonath
a
n Nieder
Describe DO
C
BOOK_XSL_172, ASCII
D
O
C
_NO_ROFF options
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Je
f
f King
p
ull:
i
mprove
advice f
o
r unconfigure
d
e
rr
o
r
case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Ju
n
i
o C
Hamano
M
e
r
g
e g
i
t://g
i
t
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-10-09
Junio C Ha
m
ano
Merge
branch 'm
s
/msvc'
commit
|
commitdiff
|
tree
2009-10-09
Junio C
H
a
m
ano
Updat
e
draft release notes t
o
1
.
6
.
5
commit
|
commitdiff
|
tree
2009-10-09
Junio C Ham
a
no
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-10-09
Brandon Casey
Makefil
e
: add
a
not
e
about t
h
e
NO_MM
A
P
setting on
IRIX
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
B
en
Walton
ls-files: d
i
e ins
t
ead
of fprintf/exit in -i error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
B
r
andon Ca
s
ey
Makefile: enable THREAD
E
D_DELTA_SEARCH
o
n IRIX a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Ramsay Jones
Fix th
e
exit co
d
e o
f
MSVC build script
s
on cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Ramsay Jone
s
Fix MS
V
C buil
d
on cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
René
S
ch
a
rfe
Gi
t
archive and trail
i
ng "/" in
prefix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-08
Stephen Boyd
c
o
mplet
i
on:
a
dd dirstat and frien
d
s to dif
f
options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-08
Stephe
n
Boyd
c
om
p
l
e
t
i
on: update am,
c
ommit, a
n
d log
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-08
Br
a
n
do
n
Ca
s
e
y
M
a
kef
i
le:
ena
b
le
T
H
READED_DELTA_SEARCH on SunOS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-08
Junio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-10-07
Junio C
Ha
m
ano
fast-i
m
po
r
t
.
c::validate_r
a
w_date(): rea
l
ly
validate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-07
Stefan
N
ae
w
e
README: g
i
t lives at ht
t
p://git-s
c
m
.
c
o
m these
d
ays
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-05
J
u
nio C Haman
o
git-pu
l
l: d
e
a
d code removal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-04
Jun
i
o C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-10-04
Junio
C Hamano
Merg
e
branch 'jc/maint
-
1
.
6
.
4-s
h
ow-bra
n
c
h
-
default' into
.
.
.
commit
|
commitdiff
|
tree
2009-10-04
Junio C Ha
m
an
o
s
h
o
w-branc
h
: fix segfaul
t
when sh
o
w
branch
.
default exists
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-23
Jun
i
o C Haman
o
pull: C
l
a
rify "he
l
p
f
ul
"
messag
e
for a
n
other corner
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-23
Thiago Farina
Updat
e
"describe" do
c
umentation to ma
t
ch
r
eali
t
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-22
SZEDER Gábo
r
bash
:
t
e
a
ch 'git reset --patch'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-22
SZEDER Gábor
bash: up
d
ate 'git st
a
sh' completion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-22
S
ZEDE
R
Gábor
b
a
sh:
r
ena
m
e
__
g
it_find_subco
m
mand() to __git
_
find_o
n
_
c
mdline()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-22
Junio C Hamano
pay attention to
D
ESTDIR when
b
u
ilding
w
it
h
NO
_
PERL_MAK
E
MAKER
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-22
Jim
M
e
yering
pre-commit
.
sa
m
ple: add comment re tr
po
r
tabili
t
y;
f
i
x
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-22
J
u
n
i
o
C Hamano
Update
Release N
o
tes to 1
.
6
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-21
J
o
ha
n
ne
s
S
ix
t
te
s
t
-
genr
a
ndom:
ens
u
re
s
tdou
t
is set t
o
_O_B
I
NARY o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-21
Junio C Ham
a
no
Merge
g
it:
/
/git
.
kernel
.
org/pub
/
sc
m
/gitk
/
gitk
commit
|
commitdiff
|
tree
2009-09-20
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2009-09-20
Matthieu Moy
p
u
sh
:
Corr
e
ctly in
i
t
ial
i
ze nonfastforward in transport_
p
ush
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
M
a
r
ius Storm
-
Olsen
Tag G
I
T_VERSION
w
hen Git
is b
u
i
l
t
with MSVC
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
Marius Storm-Olsen
Add scripts to generate p
r
o
j
ects for other buildsystems
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
M
arius Storm-Olsen
Add README
f
or MS
V
C build
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
Marius Storm-Olsen
Add MSVC to Make
f
il
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
M
arius Storm-Ols
e
n
Define s
t
rncasecmp and ftruncate for MSVC
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
M
a
rius Storm-Olsen
Make usage
o
f windows
.
h lean and mean
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
Fran
k
Li
Add platfor
m
fi
l
es for porti
n
g
t
o MSVC
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
Frank
L
i
Add MinGW hea
d
er files to b
u
ild g
i
t with MSVC
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
M
ar
i
us Storm-Olse
n
Add
e
mp
t
y heade
r
file
s
fo
r
MSVC p
o
rt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
F
r
a
n
k
L
i
Test f
o
r
WIN32 instead of
_
_MINGW32_
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
Frank Li
Fix _
_
s
t
dcall plac
e
ment and function pro
t
otype
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
M
a
rius Storm-Ols
e
n
S
et _O_BINARY as d
e
fault f
m
ode for both Mi
n
G
W a
n
d MSVC
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
Frank
L
i
Change r
e
gerro
r
() declara
t
ion from K&
R
style
t
o ANSI
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
Mar
i
us Storm-O
l
sen
Add in
c
lu
d
e gua
r
ds to co
m
pat/win
3
2
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
Frank Li
Avoid declaration afte
r
statement
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
Thiago Farina
pack-ob
j
ects: remove SP
at the en
d
of usage string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
Thiago
Fa
r
ina
Update the usage b
u
n
dle string
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-17
Clemens Buch
a
cher
cvs:
i
ni
t
iali
z
e empty
p
assword
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-16
J
u
nio C Hamano
Merge 1
.
6
.
4
.
4 in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-16
Junio C Ha
m
ano
GIT 1
.
6
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-16
Junio C
Hamano
Mer
g
e branch 'jc/maint-u
n
pack-objects
-
st
r
ict
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-09-16
Junio C Hamano
M
e
rge branch 'tf/diff-whitespace-incomp
l
ete
-
line' into
.
.
.
commit
|
commitdiff
|
tree
2009-09-16
Junio C Hamano
Merge branch
'
jk/maint-1
.
6
.
3-
c
heckou
t
-unbo
r
n' into
.
.
.
commit
|
commitdiff
|
tree
2009-09-16
J
u
nio C H
a
mano
Mer
g
e branch 'jc/maint-ch
e
ckout-index-to-prefix' into
.
.
.
commit
|
commitdiff
|
tree
2009-09-14
Ju
n
io
C H
a
man
o
Merge bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2009-09-14
Junio C Hamano
Merge branch 'rc/maint-ht
t
p
-n
o
-head-pa
c
k-check' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-09-14
Junio C
H
a
m
an
o
h
ttp
.
c: avoid freei
n
g an uninitialized poin
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-14
Heiko Voigt
web--bro
w
se: fix Mac OS X
GUI detectio
n
f
o
r 10
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-14
Heiko V
o
igt
remo
v
e logica
l
typo
i
n documen
t
ati
o
n of s
a
m
p
le update
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-14
N
i
colas Pitre
Nicolas
Pitre has a new email
a
ddress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-13
Dmitry Potapov
git-archive: infer
outpu
t
format from
filen
a
me
when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-13
Todd Zullinger
c
omp
l
e
t
i
on: Replace config --list with --get-regexp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-13
D
mitry Pota
p
ov
git-arch
i
v
e:
a
dd
'
-o' as a alias for '--
o
utp
u
t'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-13
C
l
emens Buchacher
t
est local clone by copying
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-13
Johannes
Gil
g
er
git-clone doc
:
typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-13
Nelson Elhage
gi
t
-pus
h
: Accept -n
a
s a syn
o
nym f
o
r -
-
dry-
r
un
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-13
J
unio C Ha
m
ano
g
i
t-com
m
it doc: remove dupli
c
ated --dry-run descripti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-13
J
u
n
io C Hamano
GIT 1
.
6
.
5-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-13
Jari Aalto
Improve -
-
p
a
t
c
h
option documentation in git-add
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-13
Junio C Hama
n
o
Me
r
ge branch
'pk/f
a
st-
i
m
port-tars'
commit
|
commitdiff
|
tree
2009-09-13
Jun
i
o C
H
amano
Merge
b
ra
n
ch '
p
k
/fast-import-
d
irs'
commit
|
commitdiff
|
tree
2009-09-13
J
u
nio C
Hamano
Mer
g
e branch 'jt/pushin
s
teadof'
commit
|
commitdiff
|
tree
2009-09-13
Junio C Hamano
Merge b
r
anch 'jk/unwant
e
d-
a
d
vic
e
s'
commit
|
commitdiff
|
tree
2009-09-13
Junio C Ham
a
no
Merge branch
'j
c
/merge
-
saner-
m
essages
'
commit
|
commitdiff
|
tree
2009-09-13
Junio
C
Hama
n
o
q
uiltimport docum
e
ntation:
--dr
y
-run a
n
d -n
a
r
e synonyms
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-13
C
l
e
men
s
Buchacher
preserve mtime of local clone
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next