repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge git://repo.or.cz/git-gui
2008-03-12
Ju
n
io
C
Ha
m
ano
Me
r
g
e
gi
t
://repo
.
or
.
cz/git-
g
ui
commit
|
commitdiff
|
tree
2008-03-12
Jun
i
o C
H
amano
Merge branch 'js
/
remote'
commit
|
commitdiff
|
tree
2008-03-12
Junio C Hamano
Merge branch
'lt/unpack-t
r
ees'
commit
|
commitdiff
|
tree
2008-03-12
Samuel Tardieu
"remote update": print
r
emote name bei
n
g f
e
t
c
he
d
from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Junio C Ha
m
ano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-03-12
Marc-Andre L
u
reau
git-svn: f
i
x find-
r
ev error message when
m
issing ar
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Jeff
K
ing
t002
1
: t
r
portability fix for
S
olaris
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Johan
n
es Sc
h
indelin
launch_editor(): all
o
w s
p
aces in the filena
m
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Mike Hommey
g
i
t rebase -
-
a
b
o
r
t
: a
l
ways re
s
t
o
re the
right commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-11
Junio C H
a
mano
Merge branch 'jc
/
cherry-pick'
(early
p
a
r
t
)
commit
|
commitdiff
|
tree
2008-03-11
J
unio C Hamano
Merge bran
c
h 'mai
n
t
'
commit
|
commitdiff
|
tree
2008-03-11
Jun
i
o C Hamano
Merge bran
c
h 'kb/maint-filter-branch-disappe
a
r
' into
.
.
.
commit
|
commitdiff
|
tree
2008-03-11
Ju
n
io C Ha
m
ano
M
e
r
ge
b
ra
n
ch 'a
w
/maint-shortlog-
b
lank
-
lines' into maint
commit
|
commitdiff
|
tree
2008-03-11
Linus Torvalds
u
n
pack_trees()
:
fix diff-index regressio
n
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-11
SZE
D
ER Gábor
update 'git rebase' documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-10
Junio C Hamano
traverse
_
trees_
r
ecu
r
s
ive():
p
r
o
pagate merge err
o
r
s
up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-10
Junio C Hamano
git-
p
ull doc
u
mentation: warn abou
t
the option order
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Lin
u
s Torvalds
un
p
ack_tr
e
es():
minor memo
r
y lea
k
fix in unused destinati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
L
i
nus Torvalds
M
ake 'unpack_tree
s
(
)
'
have a separate source an
d
destination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
L
inus Torvalds
Ma
k
e 'unpack_trees(
)
' take t
h
e
i
nd
e
x
t
o w
o
rk
o
n as
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
Add 'const' where
a
ppro
p
riate to index handling functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Lin
u
s To
r
vald
s
Fix
t
ree-wa
l
king compa
r
e
_entry()
i
n
the pr
e
sense of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
L
inus T
o
rvalds
Move 'unpack_trees()' o
v
er to 'traverse_trees
(
)
'
interface
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvald
s
Ma
k
e 'traverse_
t
rees()' tr
a
verse conflicting DF entri
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Lin
u
s Torvalds
Add retu
r
n value
to
'traverse_t
r
e
e
()' ca
l
lbac
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus
T
orvald
s
Make 'traverse_tree(
)
'
u
s
e
linked structu
r
e
rathe
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvald
s
Add '
d
f
_name_
c
o
m
pare()' helper functi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Joh
a
n
nes
Schinde
l
in
bui
l
tin remote r
m
: remove sym
b
olic
r
efs, t
o
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Je
f
f King
Add a t
e
st for rea
d
-tree -u --
r
eset w
i
t
h
a D/F conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Junio
C
Hamano
Me
r
ge branch 'ph/pa
r
seop
t
'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C
Hama
n
o
Mer
g
e branch
'
dp/
c
l
ean-f
i
x'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge branch 'ml/submodule-add-existing
'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
M
erge bran
c
h 'mr
/
c
o
mpa
t
-snprintf'
commit
|
commitdiff
|
tree
2008-03-09
Jun
i
o C Ham
a
no
M
e
rge branc
h
'sp/fetch-optim'
commit
|
commitdiff
|
tree
2008-03-09
Junio C H
a
m
ano
Me
r
ge branch '
j
c
/
describe-
a
lways'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge bran
c
h 'jc/am
'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C
Ham
a
no
Merge br
a
nch 'cr/reset-
p
ar
s
eopt'
commit
|
commitdiff
|
tree
2008-03-09
Ju
n
io C
H
amano
Merge branch 'jn/gitweb-pickaxe'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge
branch 'k
b
/maint-filter-bra
n
ch-disappear'
commit
|
commitdiff
|
tree
2008-03-09
Jun
i
o C Hamano
Merge branch 'maint'
to sync with 1
.
5
.
4
.
4
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
GIT 1
.
5
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Santi Béjar
id
e
nt
.
c: r
e
wo
r
d e
r
ror mes
s
age when the use
r
name cannot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Joh
n
G
oerzen
Fix dco
m
mit, rebase when rewriteRo
o
t is in use
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hama
n
o
filt
e
r-
b
ranc
h
:
handle "di
s
appearing tre
e
" case correctly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Charles B
a
il
e
y
merge
-
tool do
c
u
m
ent
a
tion:
describ
e
custom c
o
mmand us
a
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bai
l
ey
git-mergeto
o
l do
c
ument
a
iton: show too
l
names
in t
y
pewriter
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Ade
o
dato
Simó
Re
a
lly
m
a
k
e the LF after reset
in fast-import op
t
ional
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
J
u
nio C Hamano
M
erge bra
n
ch 'aw/maint-shortlog-
b
l
a
nk-lines'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Me
r
g
e
b
ranch 'mh/mai
n
t-http-p
r
oxy-fix' in
t
o maint
commit
|
commitdiff
|
tree
2008-03-08
J
u
n
i
o
C H
a
ma
n
o
Mer
g
e
b
r
a
n
c
h 'js
/
maint-daemon' into ma
i
nt
commit
|
commitdiff
|
tree
2008-03-08
J
unio C
H
ama
n
o
Me
r
ge
branch
'
js/maint-cvsexport
'
i
nto maint
commit
|
commitdiff
|
tree
2008-03-08
J
u
nio C Hamano
Merge branch 'jc/main
t
-l
o
g
-
merge-l
e
ft-righ
t
'
i
n
t
o maint
commit
|
commitdiff
|
tree
2008-03-08
Jun
i
o C Haman
o
M
e
rge
branch
'ew/m
a
int-svn-cert
-
fileprovi
d
e
r' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2008-03-08
J
u
nio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-03-08
J
uni
o
C Hamano
send-e
m
a
il: --no-
s
igned-
o
ff
-
cc shoul
d
sup
p
ress 'sob'
cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Juni
o
C
H
a
m
ano
Merge branc
h
'js
/
reflog-d
e
lete'
commit
|
commitdiff
|
tree
2008-03-08
Ju
n
io C Hama
n
o
M
e
rg
e
branch
'
dc/format-pretty'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hama
n
o
Merge branch
'
cb/merg
e
to
o
l'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
git-clean: add te
s
ts for re
l
ative
path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
D
m
itry Potapov
git-clean: correct p
r
inting relative path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Dmitry Potap
o
v
Make
private
quote_path() in
w
t-status
.
c availabl
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Pierre Habouzit
u
n
quote_c_style: fix
o
ff-by
-
one
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Ham
a
no
test-l
i
b: fix TE
R
M
t
o dumb
for test
r
epeatabil
i
ty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
U
we
Kleine-Kön
i
g
conf
i
g
.
t
x
t: refer
to --upload-pack and --rec
e
iv
e
-
p
a
ck
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Ha
m
ano
Merge bra
n
ch 'ar/
s
gid-bsd'
commit
|
commitdiff
|
tree
2008-03-07
Ju
n
io C Hamano
M
e
rge branch 'cc/run-command'
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
Re
v
ert par
t
of d0
8
9eba (setup
:
sanitize absolu
t
e and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Jun
i
o
C Hama
n
o
R
ev
e
rt part of 1abf09
5
(git-add: adjust to the get_pa
t
hspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Ha
m
a
no
R
evert par
t
of 744
d
a
c
d (
b
uiltin-mv: minim
u
m
fi
x
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Ju
n
io C Hama
n
o
get_p
a
thspec(
)
: di
e
whe
n
an out-of-
t
r
ee path is given
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-06
Junio
C
Hamano
Merge branch '
m
aint' of git://
r
epo
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2008-03-05
Jaku
b
Nareb
s
ki
gitweb
:
Fix an
d
simplify pickaxe s
e
arc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Mark Levedah
l
git-submodule - Allow adding a subm
o
dul
e
in-place
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Andy Whitcroft
s
hortlog: tak
e
the
first populated
line of th
e
description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Michal Rokos
Add co
m
pat/s
n
prin
t
f
.
c
for systems that return bogus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Alex Riesen
Do not use GUID on dir in
g
it
i
nit --shared=
a
ll on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Chr
i
s
tian Co
u
der
run-command: R
e
dire
c
t std
e
rr t
o
a pipe before red
i
recting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Johannes S
c
hinde
l
in
r
emote: fix "upda
t
e [group
.
.
.
]"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Car
l
os Rica
Make bu
i
ltin
-
reset
.
c
u
se parse_options
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
SZEDER Gábor
bash: g
i
t-b
r
a
nch
-d and -
m
lists
only local
branc
h
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
SZE
D
ER Gábor
bash: add git-br
a
n
c
h options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add a very basic
t
est scr
i
pt for git mergetool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Ba
i
ley
T
e
ach
g
it
mergetool to us
e
custom c
o
mmands defined
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles B
a
i
ley
Changed an internal
variable of merge
t
o
o
l t
o
s
u
p
port
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s Ba
i
l
ey
T
i
dy up gi
t
mergetool's backu
p
f
i
le behaviour
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
D
e
nis Che
n
g
log/show/whatchanged: introduce fo
r
mat
.
p
r
e
tty confi
g
ura
t
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
D
e
nis Che
n
g
specif
y
ex
p
licit "--prett
y
=
medium"
w
ith `git lo
g
/
show
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
De
n
is
Cheng
wha
t
changed documentation
:
sha
r
e description of --pretty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Junio C
H
a
m
ano
am: --rebas
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Junio C Hamano
am: remove suppor
t
f
o
r -d
.
dotest
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Ju
n
io C Hamano
am: re
a
d f
r
om the right mailbox when started from a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Juni
o
C Hamano
fsck
.
c
: fix bog
u
s "empty t
r
e
e
" check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Shawn
O
.
Pearce
Teach git-fet
c
h to
exploit server s
i
de automat
i
c
t
ag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Shawn O
.
Pearce
Teach fetch-pac
k
/up
l
oad
-
p
ack about
-
-
i
nclude-tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Shawn
O
.
Pearce
g
it-pack-o
b
j
ects: Automati
c
a
l
ly pack annotate
d
tags
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Junio C Hamano
Rev
e
rt "unpac
k
-o
b
je
c
ts
:
prevent writing o
f
inconsist
e
nt
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Junio C Hamano
R
e
vert "rec
e
i
ve-pack: use strict
m
o
de for unpa
c
k
i
ng
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Junio C H
a
mano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pearce
Fix 'git rem
o
t
e show' regression on empty reposi
t
ory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Mike Hommey
t3407-rebase-abort
.
sh: Enhance existing
t
ests, and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next