- 07 1月, 2009 13 次提交
-
-
由 Junio C Hamano 提交于
* rs/diff-ihc: diff: add option to show context between close hunks Conflicts: Documentation/diff-options.txt
-
由 Junio C Hamano 提交于
* js/maint-merge-recursive-r-d-conflict: merge-recursive: mark rename/delete conflict as unmerged
-
由 Junio C Hamano 提交于
* mk/gitweb-feature: gitweb: unify boolean feature subroutines
-
由 Junio C Hamano 提交于
* cb/merge-recursive-fix: merge-recursive: do not clobber untracked working tree garbage modify/delete conflict resolution overwrites untracked file
-
由 Junio C Hamano 提交于
* kk/maint-http-push: http-push: support full URI in handle_remote_ls_ctx()
-
由 Junio C Hamano 提交于
* mv/um-pdf: Add support for a pdf version of the user manual
-
由 Junio C Hamano 提交于
* 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
-
由 Junio C Hamano 提交于
* wp/add-p-goto: Add 'g' command to go to a hunk Add subroutine to display one-line summary of hunks
-
由 René Scharfe 提交于
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: NRene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint: README: tutorial.txt is now called gittutorial.txt
-
由 Junio C Hamano 提交于
* maint-1.6.0: README: tutorial.txt is now called gittutorial.txt
-
由 Junio C Hamano 提交于
* maint-1.5.6: README: tutorial.txt is now called gittutorial.txt
-
由 Joey Hess 提交于
Signed-off-by: NJoey Hess <joey@gnu.kitenet.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 06 1月, 2009 7 次提交
-
-
由 Junio C Hamano 提交于
* maint: Be consistent in switch usage for tar Use capitalized names where appropriate fast-export: print usage when no options specified
-
由 Alexander Potashev 提交于
LF at the end of format strings given to die() is redundant because die already adds one on its own. Signed-off-by: NAlexander Potashev <aspotashev@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Henrik Austad 提交于
tar handles switches with and witout preceding '-', but the documentation should be consistent nonetheless. Signed-off-by: NHenrik Austad <henrik@austad.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Henrik Austad 提交于
The Linux kernel and Emacs are both spelled capitalized Signed-off-by: NHenrik Austad <henrik@austad.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 SZEDER Gábor 提交于
Signed-off-by: NSZEDER Gábor <szeder@ira.uka.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Johannes Schindelin 提交于
We used to extract the tagger information "by hand" in "git show <tag>", but the function pp_user_info() already does that. Even better: it respects the commit_format and date_format specified by the user. Signed-off-by: NJohannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Giuseppe Bilotta 提交于
Since the OPML project list view was hand-coding the RSS and HTML URLs, it didn't respect global options such as use_pathinfo. Make it use href() to ensure consistency with the rest of the gitweb setup. Signed-off-by: NGiuseppe Bilotta <giuseppe.bilotta@gmail.com> Acked-by: NJakub Narebski <jnareb@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 04 1月, 2009 4 次提交
-
-
由 Miklos Vajna 提交于
Signed-off-by: NMiklos Vajna <vmiklos@frugalware.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* jc/maint-do-not-switch-to-non-commit: git checkout: do not allow switching to a tree-ish that is not a commit
-
由 Junio C Hamano 提交于
* ap/maint-apply-modefix: builtin-apply: prevent non-explicit permission changes
-
由 Junio C Hamano 提交于
"git checkout -b newbranch $commit^{tree}" mistakenly created a new branch rooted at the current HEAD, because in that case, the two structure fields used to see if the command was invoked without any argument (hence it needs to default to checking out the HEAD) were populated incorrectly. Upon seeing a command line argument that we took as a rev, we should store that string in new.name, even if that does not name a commit. This will correctly trigger the existing safety logic. Signed-off-by: NJunio C Hamano <gitster@pobox.com> Acked-by: NDaniel Barkalow <barkalow@iabervon.org>
-
- 03 1月, 2009 2 次提交
-
-
由 Junio C Hamano 提交于
A git patch that does not change the executable bit records the mode bits on its "index" line. "git apply" used to interpret this mode exactly the same way as it interprets the mode recorded on "new mode" line, as the wish by the patch submitter to set the mode to the one recorded on the line. The reason the mode does not agree between the submitter and the receiver in the first place is because there is _another_ commit that only appears on one side but not the other since their histories diverged, and that commit changes the mode. The patch has "index" line but not "new mode" line because its change is about updating the contents without affecting the mode. The application of such a patch is an explicit wish by the submitter to only cherry-pick the commit that updates the contents without cherry-picking the commit that modifies the mode. Viewed this way, the current behaviour is problematic, even though the command does warn when the mode of the path being patched does not match this mode, and a careful user could detect this inconsistencies between the patch submitter and the patch receiver. This changes the semantics of the mode recorded on the "index" line; instead of interpreting it as the submitter's wish to set the mode to the recorded value, it merely informs what the mode submitter happened to have, and the presense of the "index" line is taken as submitter's wish to keep whatever the mode is on the receiving end. This is based on the patch originally done by Alexander Potashev with a minor fix; the tests are mine. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Johannes Schindelin 提交于
It is not a good practice to prefer performance over readability in something as performance uncritical as finding the trailing slash of argv[0]. So avoid head-scratching by making the loop user-readable, and not hyper-performance-optimized. Signed-off-by: NJohannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 01 1月, 2009 3 次提交
-
-
由 Junio C Hamano 提交于
* cb/mergetool: mergetool: Don't keep temporary merge files unless told to mergetool: Add prompt to continue after failing to merge a file Add -y/--no-prompt option to mergetool Fix some tab/space inconsistencies in git-mergetool.sh
-
由 Junio C Hamano 提交于
* maint: Documentation/git-tag.txt: minor typo and grammar fix
-
由 jidanni@jidanni.org 提交于
Signed-off-by: Njidanni <jidanni@jidanni.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 29 12月, 2008 8 次提交
-
-
由 Junio C Hamano 提交于
* lt/reset-merge: Document "git-reset --merge" Add 'merge' mode to 'git reset'
-
由 Junio C Hamano 提交于
* np/auto-thread: Force t5302 to use a single thread pack-objects: don't use too many threads with few objects autodetect number of CPUs by default when using threads
-
由 Junio C Hamano 提交于
* maint: Prepare for v1.6.1.1 maintenance release Documentation/diff-options.txt: unify options gitweb: Fix export check in git_get_projects_list Conflicts: RelNotes
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 jidanni@jidanni.org 提交于
Instead of listing short option (e.g. "-U<n>") as a shorthand for its longer counterpart (e.g. "--unified=<n>"), list the synonyms together. It saves one indirection to find what the reader wants. Signed-off-by: Njidanni <jidanni@jidanni.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 René Scharfe 提交于
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: NRene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Teemu Likonen 提交于
"makeinfo" failed to generate gitman.info from gitman.texi input file because the combined manual page file contains several nodes with the same name (DESCRIPTION, OPTIONS, SEE ALSO etc.). An Info document should contain unique node names. This patch creates a simple (read: ugly) work-around by suppressing the validation of the final Info file. Jumping to nodes in the Info document still works but they are not very useful. Common man-page headings like DESCRIPTION and OPTIONS appear in the Info node list and they point to the man page where they appear first (that is git-add currently). Also, this patch adds directory-entry information for Info document to make the document appear in the top-level Info directory. Signed-off-by: NTeemu Likonen <tlikonen@iki.fi> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Teemu Likonen 提交于
Previously "docbook2x-texi" failed to generate user-manual.texi and gitman.texi files from .xml input files because "iconv" stopped at "illegal input sequence" error. This was due to some UTF-8 octets in the input .xml files. This patch adds option --encoding=UTF-8 for "docbook2x-texi" to allow the building of .texi files complete. Signed-off-by: NTeemu Likonen <tlikonen@iki.fi> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 28 12月, 2008 3 次提交
-
-
由 Devin Doucette 提交于
When $filter was empty, the path passed to check_export_ok would contain an extra '/', which some implementations of export_auth_hook are sensitive to. It makes more sense to fix this here than to handle the special case in each implementation of export_auth_hook. Signed-off-by: NDevin Doucette <devin@doucette.cc> Acked-by: NJakub Narebski <jnareb@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint: git-send-email.txt: move --format-patch paragraph to a proper location git-shortlog.txt: improve documentation about .mailmap files pretty: support multiline subjects with format: pretty: factor out format_subject() pretty: factor out skip_empty_lines() merge-file: handle freopen() failure daemon: cleanup: factor out xstrdup_tolower() daemon: cleanup: replace loop with if daemon: handle freopen() failure describe: Avoid unnecessary warning when using --all
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-