repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-22
Jun
i
o C
H
a
m
an
o
Merge gi
t
://git
.
kerne
l
.
org
/
pub/s
c
m/gitk/gitk
commit
|
commitdiff
|
tree
2008-12-21
M
arku
s
Hei
d
elber
g
Doc
u
mentation/git-
s
how-branch: work a
r
ound
"
s
ingle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Junio
C Hamano
send-em
a
il: futureproof split_ad
d
rs() su
b
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
J
unio C Hamano
Mak
e
sure lockfil
e
s
ar
e
unlo
c
ke
d
whe
n
dyi
n
g on SIG
P
I
P
E
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
René Sch
a
rfe
fast
-
im
p
ort
.
c: stricter strt
o
ul check,
s
ilen
c
e co
m
piler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
René
S
charfe
conn
e
c
t
.
c
: stric
t
er
port validation, silenc
e
c
ompiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Nanako Shira
i
shi
Add a document
a
t on how to
revert a faulty
m
erge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
K
iril
l
A
.
Ko
r
inskiy
Remove the requirement opaquelockto
k
en ur
i
s
c
heme
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Marcel
M
.
Cary
git-s
h
-set
u
p
: Fix script
s
whose
P
W
D is a
symlink into
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Mark
u
s He
i
delberg
Doc
u
mentation: fix ty
p
os, gram
m
ar, asciidoc
synt
a
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Hamano
Me
r
ge b
r
a
n
ch '
m
aint'
t
o
sync with GIT 1
.
6
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
J
u
n
io C Hamano
GIT 1
.
6
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Ham
a
no
fast
-
i
m
p
o
rt: make tagger
i
n
formati
o
n optional
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
J
o
hannes
S
ch
i
ndelin
fast-export: deal wi
t
h tag ob
j
ects th
a
t do not have
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Mik
l
o
s
V
a
jna
SubmittingPatches
:
mention the usage of real name in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
David
A
g
uilar
git-mergetool: pr
o
perly handle
"git mergetoo
l
-
-
filename"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Wu F
e
ngguang
git-send-email:
h
andle email address with
q
uot
e
d comma
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Markus Heidelb
e
r
g
Documentation: fix t
y
p
os, gramma
r
, as
c
iido
c
syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-19
Markus Heide
l
b
e
rg
Documentation:
syn
c
ex
a
mp
l
e output with git out
p
ut
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Re
n
é Scharfe
Fix type-mismatch comp
i
ler warni
n
g from diff_
p
o
pulate_
f
ilesp
e
c
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Michael J Grube
r
test ove
r
lappi
n
g ig
n
o
r
e pa
t
terns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Ju
n
io C Hamano
Merge b
r
anch 'lt/rea
d
link'
commit
|
commitdiff
|
tree
2008-12-18
Arjen Laarhoven
E
n
a
ble threade
d
delta sea
r
ch
on Mac OS X
/
Darwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Nanako Shiraish
i
C
larify documen
t
ation of "git
checkout
<
tre
e
-ish> pat
h
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Junio
C
H
a
m
ano
Merge git://rep
o
.
or
.
c
z
/
g
it-gu
i
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
githooks
doc
u
m
e
ntation: add a note about the +x mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Ju
n
io
C Haman
o
comb
i
ne-diff
.
c: use strbuf_readlink(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
b
u
iltin-blame
.
c: use strbuf_readlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Ha
m
ano
m
a
k
e_absolute_path
(
): c
h
eck bo
u
nd
s
w
hen s
e
eing
an ov
e
rlong
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus To
r
valds
Make 'pr
e
p
are_temp_file()' ignore st_
s
i
ze
for
symlink
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus T
o
r
v
alds
Make 'd
i
ff_
p
o
pulate_f
i
lespec()
'
us
e
the new 'strbuf_readlink()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvald
s
Mak
e
'index_path()' u
s
e '
s
trbuf_readl
i
n
k()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus To
r
valds
Make 'ce_com
p
are_link(
)
'
use the
n
ew 'strbuf_
r
eadlink()
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torva
l
ds
Add generic 'strbuf_
r
eadlink()' helper f
u
nctio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Markus Heidelberg
doc
/
git
-
r
e
set: a
d
d ref
e
ren
c
e
t
o git-stash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Markus He
i
d
elberg
Do
c
umentation: f
i
x
description fo
r
en
a
bling ho
o
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Mi
k
l
o
s
Vajna
git
-
daemon d
o
cumentat
i
on
:
use {tilde}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hama
n
o
gitweb: do not run "git d
i
ff" that is Porc
e
lain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
GIT 1
.
5
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Haman
o
GIT 1
.
5
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
GIT
1
.
5
.
4
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C
H
am
a
no
gitweb: do not
r
un "git diff" that is Porcel
a
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
L
e
e Marl
o
w
bash
c
ompletion: Syn
c
c
o
nfig vari
a
bles with their ma
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Lee Marlow
bash
completion:
S
ort config c
o
m
p
le
t
i
on varia
b
les
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
J
u
nio
C
Hamano
M
er
g
e bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-12-16
Johannes Schindelin
fast-im
p
ort: close pa
c
k
before
unlinking it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Jun
i
o C
H
a
m
a
n
o
p
ager: do
not d
u
p2 std
e
rr
if it i
s
already redirecte
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Junio C Ham
a
n
o
git-show: do not se
g
fault w
h
en showing
a
bad
t
ag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Joha
n
nes Schin
d
e
l
i
n
Get
r
id of
the last
r
emnants of GIT_CONFIG_LOCAL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Alexander
Gavrilov
Documentation: Descri
b
e git-gui Tools menu con
f
igurat
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
YONE
T
ANI
T
omokazu
git-
f
ast-import possible
memory
c
o
r
r
uption problem
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Ma
r
kus Heidelb
e
rg
bui
l
tin-commi
t
: remov
e
unused message variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-13
Brando
n
Casey
git-branch: disp
l
ay sha1
on bran
c
h delet
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Jim Meye
r
ing
git-config
.
tx
t
: fix a ty
p
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Junio
C
Hamano
M
e
rge branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-12-11
Linus T
o
rvalds
fsck:
r
ed
u
ce stack footpr
i
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Jeff King
rebase: imp
r
ove error
mess
a
ges abo
u
t d
i
r
t
y
s
t
ate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Nicolas P
i
t
r
e
make
s
u
re
p
acks to be replaced are closed befor
e
han
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Alex
a
nder Potashev
Fix typo
i
n comment in built
i
n-ad
d
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio C
Haman
o
Fix t40
3
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Juni
o
C Hamano
Mer
g
e branch
'
maint'
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
diff: r
e
spect tex
t
con
v
in
r
ewrite d
i
ffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
d
i
ff: fix handling of binary
r
ewrite diffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Alexander Po
t
ashev
Fix typos in
d
ocument
a
t
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Tor Arvid Lund
git-
p
4: Fix r
e
gres
s
ion in p4Where
m
ethod
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Ralf Wildenhues
I
m
prove language i
n
git
-
merge
.
txt and r
e
lated doc
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
work aroun
d
Python war
n
ings from AsciiDoc
Signed-off-by:
Junio C Hamano
<junio@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-09
Alexey B
o
rzenko
v
Def
i
ne link
g
i
t macro in [macros] sect
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-09
Deskin Mill
e
r
git-svn: Make fo
l
lowing parents ato
m
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jakub Narebski
gi
t
web: Fix bug in insert_file() subroutine
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
J
eff Ki
n
g
di
f
f
:
allow turni
n
g
o
n textconv expli
c
it
l
y
for p
l
umbing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
J
e
f
f
Kin
g
r
e
order ALLOW_TEXT
C
ONV op
t
i
on setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Juni
o
C Hamano
rea
d
-
cache
.
c:
typ
o
fix
i
n c
o
mme
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Ha
m
ano
builtin-checkout
.
c: che
c
k error r
e
turn fr
o
m rea
d
_cache()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C H
a
mano
Poin
t
"stale" 1
.
6
.
0
.
5
d
ocumentation
from
the main git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Ju
n
io C Hamano
Revert
"git-stash: use gi
t
rev-parse -q"
commit
|
commitdiff
|
tree
2008-12-07
J
u
n
io
C
H
am
a
no
Update draft rel
e
ase notes for 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Jun
i
o C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-07
Junio C Hamano
GIT 1
.
6
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Matt
McCutchen
"git diff <tree>{3,}": do not reverse
o
rder of ar
g
uments
commit
|
commitdiff
|
tree
2008-12-07
J
e
ff K
i
ng
tag: delet
e
T
AG_EDITMSG only o
n
successful t
a
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Jakub Nareb
s
ki
gitweb: Make
p
roje
c
t
specific override for '
g
rep' feature
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
M
i
klos V
a
j
na
h
t
tp
.
c
:
use 'git_confi
g
_string' to get 'curl_htt
p
_proxy'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Thomas Ra
s
t
f
etch-pack: Av
o
id
m
emcpy(
)
with src==dst
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-06
Junio C Hama
n
o
U
pdate draft
r
ele
a
se notes
t
o 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-06
J
u
n
io C Hamano
M
e
rge branch 'jc/a
m
-options'
commit
|
commitdiff
|
tree
2008-12-06
Junio C Ham
a
no
git-am: rename apply_
o
pt_extra file to apply-opt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Junio C Hamano
Test
that gi
t
-a
m
doe
s
not lose -C/-p
/
--white
s
pa
c
e opti
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Juni
o
C
H
amano
git-
a
m:
p
ropagate --3way options as well
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
J
unio C Hamano
git-am: propagate -C
<
n>, -p<
n
> options
as
well
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
J
u
n
i
o C Hamano
git-am --whitespa
c
e: do not lose the
c
o
m
ma
n
d
line
o
pt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Tor Arvid
L
und
git-p
4
:
Fix bug in p4Where method
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Alex Riesen
Repo
r
t
s
y
mlin
k
failures in m
e
r
g
e-recur
s
ive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Alex Riesen
Make chdir
f
ailu
r
es visible
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Alex Riesen
Make some of
fwrite/fclo
s
e/
w
rite/close
f
ailu
r
es visibl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-04
Junio C Hamano
M
e
rge branch '
d
m/svn-
r
e
mote'
commit
|
commitdiff
|
tree
2008-12-04
J
unio
C
H
a
m
a
n
o
Merge
branch 'jn/
g
itweb-utf8'
commit
|
commitdiff
|
tree
2008-12-04
Jeff Ki
n
g
add stage to gitign
o
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklos V
a
jn
a
s
ubmodu
l
e: use git rev-pa
r
se -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next