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
merge-recursive: mark rename/delete conflict as unmerged
2008-12-25
Joha
n
nes Sch
i
ndelin
merg
e
-recursive: mark rename/delete conflict as unmerged
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-25
J
u
nio C
Hamano
GIT 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-24
Junio C Hamano
Merge bran
c
h 'js
/
r
e
base
-
i-
p
'
commit
|
commitdiff
|
tree
2008-12-24
Johannes Sc
h
in
d
elin
rebase -i -p
:
lea
v
e a --cc
p
atch when a merge could
.
.
.
commit
|
commitdiff
|
tree
2008-12-23
Miklos Vaj
n
a
t9129: skip the
l
ast three tests if UTF-8 locale is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Junio C Haman
o
GIT 1
.
6
.
1
-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Richard Hartman
n
Alway
s
s
how wh
i
c
h
d
irectory
i
s not a git
r
epos
i
tory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Richard Hartmann
Make
hel
p
entries alphabetical
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Junio
C Haman
o
Merg
e
branch
'maint
'
commit
|
commitdiff
|
tree
2008-12-22
Boyd Stephen Smith Jr
git-r
e
vert do
c
umentation: refe
r
to new
H
OWTO on reverting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Robin Rosenber
g
gi
t
-revert
:
re
c
or
d
the paren
t
against whi
c
h a rev
e
rt
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Junio C Hamano
Merge git
:
//git
.
kerne
l
.
or
g
/pub
/
scm/gitk/git
k
commit
|
commitdiff
|
tree
2008-12-21
Markus
Heidelb
e
rg
d
oc/g
i
t
-fsck:
c
hange the way
for g
e
tting hea
d
s' SHA1s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
M
a
r
kus Heidelber
g
Documentation/git
-
show-branch: w
o
rk around "s
i
ngle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Junio
C Hamano
send-email: future
p
r
o
of
s
pli
t
_addrs() sub
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
J
u
nio
C
Ha
m
ano
Make sure lo
c
kfiles are unlock
e
d when dying
o
n
S
IGPIPE
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Re
n
é S
c
harfe
fast-import
.
c
: stricte
r
strto
u
l check, silenc
e
compiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Re
n
é
S
cha
r
fe
connect
.
c
: stricter port validatio
n
, s
i
lence compiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Nanako Shirai
s
hi
Add a documen
t
a
t
o
n how to r
e
vert
a
f
aulty merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Kir
i
l
l
A
.
Korinskiy
Remove
t
he re
q
uire
m
ent opaqu
e
lock
t
oken uri scheme
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Marcel
M
.
Car
y
gi
t
-s
h
-setup: Fix
scripts whose PWD is a sym
l
ink into
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Johannes Sixt
r
ebase
-
i -
p
:
F
i
x --
c
ontinue aft
e
r a m
e
r
ge
could not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Joh
a
n
nes Sixt
Show a failure of r
e
b
a
se
-p
if the merge h
a
d a conflic
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Markus Heide
l
ber
g
Documentation: fix typos, g
r
am
m
a
r
, asciidoc syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Ju
n
io C Hamano
Merge
b
r
an
c
h '
m
aint' to
s
ync with GIT 1
.
6
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Hamano
G
I
T 1
.
6
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Junio
C Ham
a
no
f
a
st-i
m
port:
m
ake tagg
e
r in
f
o
rmation optional
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
J
ohann
e
s
Sch
i
n
d
elin
fast-export: deal
w
i
t
h tag o
b
jects that do not h
a
ve
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Mi
k
los Vajna
S
ubmittingPatches: me
n
ti
o
n th
e
u
sa
g
e of real n
a
me in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Dav
i
d Aguilar
g
i
t-mer
g
eto
o
l: properly h
a
n
d
le
"
git mergeto
o
l -- file
n
ame"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Wu Fe
n
ggua
n
g
git-send-email: ha
n
dle email addre
s
s wit
h
q
u
o
te
d
comma
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Marku
s
Heid
e
lberg
Documentation:
fix typo
s
,
grammar, asciidoc sy
n
tax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-19
Markus Hei
d
e
l
berg
Docum
e
n
t
a
tio
n
:
s
ync example output wit
h
g
it output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
R
ené Sc
h
arfe
Fix ty
p
e-mismatch compiler warning from di
f
f
_
populate_files
p
e
c()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Michae
l
J Gruber
test overlappi
n
g
i
gnore
patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Junio
C
Hamano
Mer
g
e branch
'
lt/rea
d
l
i
nk'
commit
|
commitdiff
|
tree
2008-12-18
Arjen Laarhoven
Enable threaded delta sear
c
h on Mac OS
X/Darwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Nanako Shiraishi
C
l
arify documentati
o
n of "git
checkout <tree-ish> paths
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
J
u
nio C Ham
a
no
Merge
gi
t
://repo
.
or
.
cz/git-gu
i
commit
|
commitdiff
|
tree
2008-12-17
Mik
l
os Vajna
githooks documentat
i
on: add a note about the +x m
o
de
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Jun
i
o C H
a
mano
com
b
ine-di
f
f
.
c:
u
se strbuf_readl
i
nk
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C H
a
ma
n
o
b
uil
t
in-blame
.
c:
use
s
trbuf_readlink(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C
Hamano
make_ab
s
olute_path(): che
c
k bounds when seeing
an overlong
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvald
s
Make 'prepare_temp_file()' i
g
n
or
e
st_size
for sym
l
inks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
L
i
nu
s
Torvalds
Make 'diff_
p
op
u
late_fi
l
es
p
ec()' use
t
he new
'
str
b
uf_
r
e
adl
i
nk()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
M
a
ke 'index_p
a
th
(
)
' use 'st
r
buf
_
re
a
dli
n
k()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
Make '
c
e_
c
ompare_link()' use
t
he new 'strbu
f
_readlink()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linu
s
Tor
v
alds
Add generic 'st
r
buf_read
l
ink()'
h
elpe
r
function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Mark
u
s Heide
l
berg
d
o
c/git-reset: ad
d
refere
n
ce to git-stash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Mark
u
s Heid
e
lberg
Documentation: f
i
x d
e
scr
i
ption for enabling hooks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Miklos
V
ajna
g
i
t-daemon documenta
t
ion: use {tilde}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Juni
o
C Hamano
g
i
tweb: do n
o
t run "git d
i
ff"
that i
s
Porcelain
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 Hamano
GIT 1
.
5
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Ham
a
no
GIT 1
.
5
.
4
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
gitweb: do not run "git
diff" that
i
s Porcelain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Lee
M
arlow
ba
s
h
c
ompletion: S
y
nc confi
g
v
a
ri
a
bles with
their man
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Lee Marlow
bash completio
n
: So
r
t c
o
nfig com
p
letion variables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Junio
C Hamano
Merge b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2008-12-16
Johann
e
s Schin
d
elin
fast-impo
r
t: c
l
ose pack before unlinking it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Junio C H
a
mano
pager: do not dup2 stderr if it is already
r
edirected
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Junio C Hamano
git-
s
how
:
do
n
ot se
g
f
ault when showing a b
a
d tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Johannes Schin
d
elin
Get rid of the las
t
re
m
n
a
nts of
GIT_CONF
I
G_LOCAL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
A
lexand
e
r Gavr
i
lov
D
o
cumentation: Desc
r
ib
e
git-gui Tools menu configu
r
ation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Y
ON
E
TANI Tomokazu
git-fast-import poss
i
b
le m
e
mory co
r
rup
t
ion
problem
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Ma
r
k
us Heide
l
berg
b
u
ilt
i
n-
c
ommit
:
remove unuse
d
messa
g
e variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
J
u
n
i
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-13
Brandon C
a
sey
git-branch
:
displ
a
y
sha1 on br
a
nch deletion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Jim Meyerin
g
git-config
.
txt: fix a typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Ju
n
io C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2008-12-11
Linus To
r
val
d
s
fsc
k
: redu
c
e
s
tack footprint
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Jeff King
reba
s
e
:
improve error me
s
sages about dirty
state
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Nic
o
las Pi
t
r
e
m
a
ke sure
packs to be rep
l
aced
a
re closed beforehand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Alexander P
o
tashev
Fix typo
i
n comm
e
nt i
n
builtin-add
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Juni
o
C Ha
m
a
no
Fi
x
t4031
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
J
u
n
io C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2008-12-10
Jeff
K
ing
diff: respect text
c
onv in rewrite diffs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Jeff K
i
ng
diff: fix handling
of bina
r
y rewrite diffs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Alexander Potash
e
v
Fix typos i
n
documen
t
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
T
or Arvid
Lund
git-p4: Fix regression in p4Where
m
ethod
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Ralf W
i
ld
e
nhue
s
Improve language in git
-
merge
.
txt
and rela
t
ed docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio C H
a
mano
w
o
r
k
aroun
d
P
y
t
hon warn
i
ngs from As
c
iiDoc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
Alexe
y
Borzenkov
Defin
e
linkgit
macro in [macros]
s
ection
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
Desk
i
n
Miller
git-svn: Make fol
l
owi
n
g parents
a
tomic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jakub Narebski
g
i
tweb: Fix bug i
n
insert_fi
l
e() s
u
brouti
n
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jef
f
K
in
g
diff: allow
turning on textconv expl
i
citly for plumbing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jeff K
i
ng
r
e
order AL
L
O
W_TEXTCON
V
option
s
e
tting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Ha
m
ano
re
a
d-c
a
c
he
.
c: typo
f
ix in comme
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C
H
aman
o
buil
t
in-
c
heckout
.
c: check
error return from read_ca
c
he()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Juni
o
C Ha
m
ano
Point "stale" 1
.
6
.
0
.
5
d
oc
u
mentation from the ma
i
n
g
i
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Hamano
Revert "git
-
stash: u
s
e git rev-parse
-
q"
commit
|
commitdiff
|
tree
2008-12-07
Jun
i
o C Hamano
U
pd
a
te draft release notes for 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Jun
i
o
C Hamano
Mer
g
e branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-12-07
Junio C
H
a
mano
GIT 1
.
6
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
M
a
t
t
M
cCutchen
"git diff <tree>{3,}": d
o
not reverse
ord
e
r of
a
rguments
commit
|
commitdiff
|
tree
2008-12-07
Jeff King
t
a
g: delete T
A
G_EDITMSG onl
y
on successful tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Jakub
N
ar
e
bski
gitweb:
M
ake pro
j
e
c
t specific override for 'grep' feature
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vaj
n
a
http
.
c: use
'
git_conf
i
g_
s
t
r
ing' to get 'curl_
h
ttp_proxy'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Th
o
mas Rast
fe
t
c
h
-
pac
k
: Avoid memcpy() wit
h
src==dst
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-06
Junio C H
a
mano
Up
d
a
t
e draft
r
elease notes to
1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next