Commit Graph

  • 8cae19d987 for-each-ref: add "upstream" format field Jeff King 2009-04-07 03:09:39 -0400
  • 8db9a4b85d for-each-ref: refactor refname handling Jeff King 2009-04-07 03:06:51 -0400
  • 6da14ee14f Merge branch 'maint' Junio C Hamano 2009-04-07 23:05:43 -0700
  • 747f9d30ed Merge branch 'maint-1.6.1' into maint Junio C Hamano 2009-04-07 23:05:14 -0700
  • 714fddf2fc Change double quotes to single quotes in message Jari Aalto 2009-03-21 11:00:54 +0200
  • aa41cf8f43 Merge branch 'maint-1.6.0' into maint-1.6.1 Junio C Hamano 2009-04-07 22:51:14 -0700
  • 9e36d11735 Merge branch 'lt/reflog-expire' Junio C Hamano 2009-04-07 22:33:13 -0700
  • 00f39fc995 Merge branch 'bs/maint-1.6.0-tree-walk-prefix' Junio C Hamano 2009-04-07 22:33:10 -0700
  • fe42fe4bca Merge branch 'ms/http-auth' Junio C Hamano 2009-04-07 22:33:05 -0700
  • a9906723b2 Merge branch 'js/maint-submodule-checkout' Junio C Hamano 2009-04-07 22:33:02 -0700
  • 2149e0f6a6 Merge branch 'cb/maint-merge-recursive-submodule-fix' Junio C Hamano 2009-04-07 22:32:56 -0700
  • d65279d5bf Merge branch 'mh/html-path' Junio C Hamano 2009-04-07 22:32:51 -0700
  • 9a62d72dfa mergetool: use $( ... ) instead of `backticks` David Aguilar 2009-04-06 01:31:28 -0700
  • e2dc2de917 bash completion: add git-difftool David Aguilar 2009-04-06 01:31:27 -0700
  • a904392eae difftool: add support for a difftool.prompt config variable David Aguilar 2009-04-07 01:21:22 -0700
  • f92f2038a5 difftool: add various git-difftool tests David Aguilar 2009-04-07 16:30:53 -0700
  • afcbc8e7ec difftool: move 'git-difftool' out of contrib David Aguilar 2009-04-07 01:21:20 -0700
  • 1c0f3d224e difftool/mergetool: add diffuse as merge and diff tool Sebastian Pipping 2009-04-06 01:31:23 -0700
  • 8b7332221d difftool: add a -y shortcut for --no-prompt David Aguilar 2009-04-07 01:21:19 -0700
  • 46ae156d6c difftool: use perl built-ins when testing for msys David Aguilar 2009-04-06 01:31:21 -0700
  • 2e8af7e42b difftool: remove the backup file feature David Aguilar 2009-04-06 01:31:20 -0700
  • 76ca653842 difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff David Aguilar 2009-04-06 01:31:19 -0700
  • b98c212a9f git-mergetool: add new merge tool TortoiseMerge Markus Heidelberg 2009-04-06 01:31:18 -0700
  • bad4273200 git-mergetool/difftool: make (g)vimdiff workable under Windows Markus Heidelberg 2009-04-06 01:31:17 -0700
  • da81688cc5 doc/merge-config: list ecmerge as a built-in merge tool Markus Heidelberg 2009-04-06 01:31:16 -0700
  • 13858e5770 rev-list: add "int bisect_show_flags" in "struct rev_list_info" Christian Couder 2009-04-07 05:08:42 +0200
  • d797257eb2 rev-list: remove last static vars used in "show_commit" Christian Couder 2009-04-06 22:28:00 +0200
  • 11c211fa06 list-objects: add "void *data" parameter to show functions Christian Couder 2009-04-06 21:28:36 +0200
  • 982962ce24 git-rev-list.txt: make ascii markup uniform with other pages. Matthieu Moy 2009-04-07 19:24:33 +0200
  • 4c0fe0af68 git-send-email.txt: clarify which options take an argument. Matthieu Moy 2009-04-07 19:24:32 +0200
  • 3d4ecc0e23 for-each-ref: refactor get_short_ref function Jeff King 2009-04-07 03:05:01 -0400
  • e892dc713e Documentation: Introduce "upstream branch" Santi Béjar 2009-04-07 01:24:30 +0200
  • 20ff3ec28e Documentation: clarify .gitattributes search Jason Merrill 2009-04-06 11:03:36 -0400
  • 39470cf961 git-checkout.txt: clarify that <branch> applies when no path is given. Matthieu Moy 2009-04-07 14:43:53 +0200
  • ce8936c342 git-checkout.txt: fix incorrect statement about HEAD and index Matthieu Moy 2009-04-06 22:45:21 +0200
  • b344e1614b git remote update: Fallback to remote if group does not exist Finn Arne Gangstad 2009-04-06 15:41:02 +0200
  • 9a23ba3375 remote: New function remote_is_configured() Finn Arne Gangstad 2009-04-06 15:41:01 +0200
  • bed5d42163 git remote update: Report error for non-existing groups Finn Arne Gangstad 2009-04-06 15:41:00 +0200
  • 87942e3f49 What's cooking Junio C Hamano 2009-04-06 01:06:54 -0700
  • 1a7b1f6b9c sha1-lookup: fix up the assertion message Junio C Hamano 2009-04-06 00:48:49 -0700
  • fbdc05661d Merge branch 'jc/name-branch' Junio C Hamano 2009-04-06 00:43:44 -0700
  • 03a39a9184 Merge branch 'jc/shared-literally' Junio C Hamano 2009-04-06 00:42:52 -0700
  • ccc852c377 Merge branch 'mg/tracked-local-branches' Junio C Hamano 2009-04-06 00:42:31 -0700
  • 87d2062b39 Merge branch 'sb/format-patch-patchname' Junio C Hamano 2009-04-06 00:42:23 -0700
  • a6e5ef7d9c user-manual: the name of the hash function is SHA-1, not sha1 Felipe Contreras 2009-04-04 12:38:27 +0300
  • a3df1e464e docbook: change css style Felipe Contreras 2009-04-04 12:38:24 +0300
  • 6127c08647 user-manual: remove some git-foo usage Felipe Contreras 2009-04-04 12:38:23 +0300
  • 5c9c990341 Documentation: branch.*.merge can also affect 'git-push' Santi Béjar 2009-03-30 12:11:42 +0200
  • 1d1876e930 Add configuration variable for sign-off to format-patch Heiko Voigt 2009-04-01 19:51:54 +0200
  • b01d432604 git-gui (Win): make starting via "Git GUI Here" on .git/ possible Markus Heidelberg 2009-04-01 01:55:39 +0200
  • 454efb47b6 git-gui (Win): make "Explore Working Copy" more robust Markus Heidelberg 2009-04-01 01:55:36 +0200
  • c9498339a4 git-gui: run post-checkout hook on checkout Jens Lehmann 2009-03-30 21:46:17 +0200
  • f0d4eec99f git-gui: When calling post-commit hook wrong variable was cleared. Jens Lehmann 2009-03-30 20:35:57 +0200
  • 3eb5682b0b git-gui: use `git --html-path` to get the location of installed HTML docs Markus Heidelberg 2009-04-05 03:48:21 +0200
  • 43acdf243e bash completion: Update 'git am' options Todd Zullinger 2009-04-05 12:33:38 -0400
  • efa54803cb git remote update: New option --prune Finn Arne Gangstad 2009-04-03 11:03:44 +0200
  • b92c5f228a builtin-remote.c: Split out prune_remote as a separate function. Finn Arne Gangstad 2009-04-03 11:02:37 +0200
  • 0eaadfe625 t/t9600: remove exit after test_done Junio C Hamano 2009-04-05 01:40:50 -0700
  • e89aa6d2f5 bisect--helper: string output variables together with "&&" Christian Couder 2009-03-30 06:59:59 +0200
  • 37c4c38d73 rev-list: pass "int flags" as last argument of "show_bisect_vars" Christian Couder 2009-03-29 11:55:43 +0200
  • b74d7efb10 t6030: test bisecting with paths Christian Couder 2009-03-29 11:45:01 +0200
  • 23b5f18b50 bisect: use "bisect--helper" and remove "filter_skipped" function Christian Couder 2009-03-26 05:56:02 +0100
  • 3b437b0dab bisect: implement "read_bisect_paths" to read paths in "$GIT_DIR/BISECT_NAMES" Christian Couder 2009-03-26 05:55:59 +0100
  • 1bf072e366 bisect--helper: implement "git bisect--helper" Christian Couder 2009-03-26 05:55:54 +0100
  • 4eb5b64631 bisect: use the new generic "sha1_pos" function to lookup sha1 Christian Couder 2009-04-04 22:59:36 +0200
  • 9518864816 rev-list: call new "filter_skip" function Christian Couder 2009-03-26 05:55:49 +0100
  • 81aa964976 Merge branch 'maint' Junio C Hamano 2009-04-05 01:17:08 -0700
  • 835a3eea3e git submodule: fix usage line Julien Danjou 2009-03-31 17:50:12 +0200
  • be18f4b899 Merge branch 'maint-1.6.1' into maint Junio C Hamano 2009-04-05 01:04:54 -0700
  • acb0b7b01f Merge branch 'maint-1.6.0' into maint-1.6.1 Junio C Hamano 2009-04-05 01:04:38 -0700
  • 38b7ccbe8c doc/git-pack-refs: fix two grammar issues Markus Heidelberg 2009-04-04 12:35:22 +0200
  • 5dba359124 tests: remove exit after test_done call Jeff King 2009-04-03 15:31:10 -0400
  • 4f6a32f8af commit: abort commit if interactive add failed Jeff King 2009-04-03 15:28:56 -0400
  • 39d8e271f4 simplify output of conflicting merge Clemens Buchacher 2009-04-05 02:47:00 +0200
  • 0eb6574c24 update cache for conflicting submodule entries Clemens Buchacher 2009-04-05 02:46:59 +0200
  • f37ae35e73 add tests for merging with submodules Clemens Buchacher 2009-04-05 02:46:58 +0200
  • f3a186ffad bisect: improve error message when branch checkout fails Christian Couder 2009-04-04 22:02:26 +0200
  • e1dc49bcde git-repack: use non-dashed update-server-info Dan McGee 2009-04-04 11:59:55 -0500
  • 89a56bfbd3 add --html-path to get the location of installed HTML docs Markus Heidelberg 2009-04-05 04:15:16 +0200
  • 5aaa507b06 Merge branch 'cc/sha1-bsearch' into HEAD Junio C Hamano 2009-04-04 23:04:50 -0700
  • 5289bae17f patch-ids: use the new generic "sha1_pos" function to lookup sha1 Christian Couder 2009-04-04 22:59:31 +0200
  • 96beef8c2e sha1-lookup: add new "sha1_pos" function to efficiently lookup sha1 Christian Couder 2009-04-04 22:59:26 +0200
  • 0da43a685a send-email: fix nasty bug in ask() function Jay Soffian 2009-04-04 23:23:21 -0400
  • e96f3689ec Update draft release notes to 1.6.3 Junio C Hamano 2009-04-02 13:42:24 -0700
  • bef3894847 Fix 'git checkout <submodule>' to update the index Johannes Schindelin 2009-04-02 15:30:25 +0200
  • 3944ba0cb0 Allow curl to rewind the read buffers Martin Storsjö 2009-04-01 19:48:24 +0300
  • ee7126b8f1 Dothem: no point not installing doc if we build it Junio C Hamano 2009-04-02 13:01:23 -0700
  • 8130949bdc Sync with 1.6.2.2 Junio C Hamano 2009-04-02 12:35:48 -0700
  • 3346330d70 GIT 1.6.2.2 v1.6.2.2 Junio C Hamano 2009-04-02 12:21:57 -0700
  • 5ab2f7b2ce Merge branch 'jc/maint-1.6.0-blame-s' into maint Junio C Hamano 2009-04-02 12:14:37 -0700
  • 958ae8fca9 Make: set ASCIIDOC_NO_ROFF unconditionally for now Junio C Hamano 2009-04-02 12:13:55 -0700
  • cb365a7a56 Merge branch 'js/maint-diff-temp-smudge' into maint Junio C Hamano 2009-04-02 12:02:30 -0700
  • 1e7ef0253c Merge branch 'js/maint-1.6.0-exec-path-env' into maint Junio C Hamano 2009-04-02 12:02:25 -0700
  • 8afd317843 Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint Junio C Hamano 2009-04-02 12:02:18 -0700
  • b5a18787bd Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint Junio C Hamano 2009-04-02 12:00:59 -0700
  • 66c9e7d487 Merge branch 'dm/maint-docco' into maint Junio C Hamano 2009-04-02 11:58:39 -0700
  • a61c0ffa44 send-email: ensure quoted addresses are rfc2047 encoded Jay Soffian 2009-03-31 12:22:14 -0400
  • 3b3637c3f1 send-email: correct two tests which were going interactive Jay Soffian 2009-03-31 12:22:13 -0400
  • 6e916ab439 Reintegrate: only detect conflict markers in conflicted files Junio C Hamano 2009-04-02 10:19:54 -0700
  • 411b5ebe48 Dothem: fix dotest/nodoc conditional Junio C Hamano 2009-04-02 10:18:29 -0700