| 17044 07.01.2009 09:10:19, by
Junio C Hamano
Merge branch 'mh/maint-sendmail-cc-doc'
* mh/maint-sendmail-cc-doc:
doc/git-send-email: mention sendemail.cc config variable
|
| 17043 07.01.2009 09:10:14, by
Junio C Hamano
Merge branch 'rs/diff-ihc'
* rs/diff-ihc:
diff: add option to show context between close hunks
Conflicts:
Documentation/diff-options.txt
|
| 17042 07.01.2009 09:09:42, by
Junio C Hamano
Merge branch 'js/maint-merge-recursive-r-d-conflict'
* js/maint-merge-recursive-r-d-conflict:
merge-recursive: mark rename/delete conflict as unmerged
|
| 17041 07.01.2009 09:09:33, by
Junio C Hamano
Merge branch 'mk/gitweb-feature'
* mk/gitweb-feature:
gitweb: unify boolean feature subroutines
|
| 17040 07.01.2009 09:09:27, by
Junio C Hamano
Merge branch 'cb/merge-recursive-fix'
* cb/merge-recursive-fix:
merge-recursive: do not clobber untracked working tree garbage
modify/delete conflict resolution overwrites untracked file
|
| 17039 07.01.2009 09:09:14, by
Junio C Hamano
Merge branch 'kk/maint-http-push'
* kk/maint-http-push:
http-push: support full URI in handle_remote_ls_ctx()
|
| 17038 07.01.2009 09:09:10, by
Junio C Hamano
Merge branch 'mv/um-pdf'
* mv/um-pdf:
Add support for a pdf version of the user manual
|
| 17037 07.01.2009 09:09:06, by
Junio C Hamano
Merge branch 'jn/gitweb-blame'
* jn/gitweb-blame:
gitweb: cache $parent_commit info in git_blame()
gitweb: A bit of code cleanup in git_blame()
gitweb: Move 'lineno' id from link to row element in git_blame
|
| 17036 07.01.2009 09:09:00, by
Junio C Hamano
Merge branch 'wp/add-p-goto'
* wp/add-p-goto:
Add 'g' command to go to a hunk
Add subroutine to display one-line summary of hunks
|
| 17035 07.01.2009 07:13:43, by
Junio C Hamano
strbuf: instate cleanup rule in case of non-memory errors
Make all strbuf functions that can fail free() their memory on error if
they have allocated it. They don't shrink buffers that have been grown,
though.
This allows for easier error handling, as callers only need to call
strbuf_release() if A) the command succeeded or B) if they would have had
to do so anyway because they added something to the strbuf themselves.
Bonus hunk: document strbuf_readlink.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com> |
| 17034 07.01.2009 07:13:41, by
Junio C Hamano
Merge branch 'maint'
* maint:
README: tutorial.txt is now called gittutorial.txt
|
| 17033 07.01.2009 07:12:35, by
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0:
README: tutorial.txt is now called gittutorial.txt
|
| 17032 07.01.2009 07:12:30, by
Junio C Hamano
Merge branch 'maint-1.5.6' into maint-1.6.0
* maint-1.5.6:
README: tutorial.txt is now called gittutorial.txt
|
| 17031 07.01.2009 07:12:07, by
Junio C Hamano
README: tutorial.txt is now called gittutorial.txt
Signed-off-by: Joey Hess <joey@gnu.kitenet.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com> |
| 17030 29.12.2008 10:06:11, by
Junio C Hamano
doc/git-send-email: mention sendemail.cc config variable
This variable was added in 5f8b9fc (git-send-email: add a new
sendemail.cc configuration variable, 2008-04-27), but is not yet refered
to by the documentation.
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com> |
| 17029 29.12.2008 10:05:21, by
Junio C Hamano
diff: add option to show context between close hunks
Merge two hunks if there is only the specified number of otherwise unshown
context between them. For --inter-hunk-context=1, the resulting patch has
the same number of lines but shows uninterrupted context instead of a
context header line in between.
Patches generated with this option are easier to read but are also more
likely to conflict if the file to be patched contains other changes.
This patch keeps the default for this option at 0. It is intended to just
make the feature available in order to see its advantages and downsides.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com> |
| 17028 25.12.2008 08:06:48, by
Junio C Hamano
merge-recursive: mark rename/delete conflict as unmerged
When a file was renamed in one branch, but deleted in the other, one
should expect the index to contain an unmerged entry, namely the
target of the rename. Make it so.
Noticed by Constantine Plotnikov.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com> |
| 17027 25.12.2008 07:57:12, by
Junio C Hamano
http-push: support full URI in handle_remote_ls_ctx()
The program calls remote_ls() to get list of files from the server over
HTTP; handle_remote_ls_ctx() is used to parse its response to populate
"struct remote_ls_ctx" that is returned from remote_ls().
The handle_remote_ls_ctx() function assumed that the server returns a
local path in href field, but RFC 4918 (14.7) demand of support full URI
(e.g. "http://localhost:8080/repo.git").
This resulted in push failure (e.g. git-http-push issues a PROPFIND
request to "/repo.git/alhost:8080/repo.git/refs/" to the server).
Signed-off-by: Kirill A. Korinskiy <catap@catap.ru>
Signed-off-by: Junio C Hamano <gitster@pobox.com> |
| 17026 16.12.2008 07:56:19, by
Junio C Hamano
gitweb: unify boolean feature subroutines
The boolean feature subroutines behaved identically except for the
name of the configuration option, so make that a parameter and unify
them.
Signed-off-by: Matt Kraai <kraai@ftbfs.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com> |
| 17025 15.12.2008 11:41:24, by
Junio C Hamano
Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fix
* cb/maint-merge-recursive-fix:
merge-recursive: do not clobber untracked working tree garbage
modify/delete conflict resolution overwrites untracked file
|
|
|