Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/alias-in-bare' into maint | Junio C Hamano | 2013-04-03 | 1 | -6/+19 |
|\ | |||||
| * | setup: suppress implicit "." work-tree for bare repos | Jeff King | 2013-03-08 | 1 | -0/+12 |
| * | environment: add GIT_PREFIX to local_repo_env | Jeff King | 2013-03-08 | 1 | -0/+1 |
| * | cache.h: drop LOCAL_REPO_ENV_SIZE | Jeff King | 2013-03-08 | 1 | -6/+6 |
* | | Sync with 1.8.1 maintenance track | Junio C Hamano | 2013-04-03 | 1 | -14/+3 |
|\ \ | |||||
| * \ | Merge branch 'kb/name-hash' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 1 | -14/+3 |
| |\ \ | | |/ | |/| | |||||
| | * | name-hash.c: fix endless loop with core.ignorecase=true | Karsten Blees | 2013-02-27 | 1 | -14/+3 |
| * | | Merge branch 'mh/ceiling' into maint | Junio C Hamano | 2013-01-28 | 1 | -1/+2 |
| |\ \ | |||||
* | \ \ | Merge branch 'jc/push-reject-reasons' | Junio C Hamano | 2013-02-04 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE | Junio C Hamano | 2013-01-24 | 1 | -0/+2 |
| * | | | | push: further clean up fields of "struct ref" | Junio C Hamano | 2013-01-24 | 1 | -3/+1 |
* | | | | | Merge branch 'jk/config-parsing-cleanup' | Junio C Hamano | 2013-02-04 | 1 | -0/+15 |
|\ \ \ \ \ | |||||
| * | | | | | config: add helper function for parsing key names | Jeff King | 2013-01-23 | 1 | -0/+15 |
* | | | | | | Merge branch 'jc/custom-comment-char' | Junio C Hamano | 2013-02-04 | 1 | -0/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Allow custom "comment char" | Junio C Hamano | 2013-01-16 | 1 | -0/+6 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'rr/minimal-stat' | Junio C Hamano | 2013-01-30 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Enable minimal stat checking | Robin Rosenberg | 2013-01-22 | 1 | -0/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jk/suppress-clang-warning' | Junio C Hamano | 2013-01-23 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix clang -Wunused-value warnings for error functions | Max Horn | 2013-01-16 | 1 | -1/+1 |
* | | | | | | | Merge branch 'cr/push-force-tag-update' | Junio C Hamano | 2013-01-23 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | | |||||
| * | | | | | push: fix "refs/tags/ hierarchy cannot be updated without --force" | Junio C Hamano | 2013-01-16 | 1 | -1/+0 |
* | | | | | | Merge branch 'jk/pathspec-literal' | Junio C Hamano | 2013-01-05 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add global --literal-pathspecs option | Jeff King | 2012-12-19 | 1 | -0/+3 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'jk/error-const-return' | Junio C Hamano | 2013-01-05 | 1 | -0/+3 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | silence some -Wuninitialized false positives | Jeff King | 2012-12-15 | 1 | -0/+3 |
| |/ / / / | |||||
* | | | | | Merge branch 'jk/mailmap-from-blob' | Junio C Hamano | 2013-01-05 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | mailmap: support reading mailmap from blobs | Jeff King | 2012-12-12 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'cr/push-force-tag-update' | Junio C Hamano | 2013-01-05 | 1 | -1/+6 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | push: require force for refs under refs/tags/ | Chris Rorvick | 2012-12-02 | 1 | -0/+1 |
| * | | | | push: flag updates that require force | Chris Rorvick | 2012-12-02 | 1 | -1/+3 |
| * | | | | push: keep track of "update" state separately | Chris Rorvick | 2012-12-02 | 1 | -0/+1 |
| * | | | | push: add advice for rejected tag reference | Chris Rorvick | 2012-12-02 | 1 | -0/+1 |
* | | | | | Merge branch 'nd/pathspec-wildcard' | Junio C Hamano | 2013-01-05 | 1 | -1/+4 |
|\ \ \ \ \ | |||||
| * | | | | | pathspec: apply "*.c" optimization from exclude | Nguyễn Thái Ngọc Duy | 2012-11-26 | 1 | -0/+3 |
| * | | | | | pathspec: save the non-wildcard length part | Nguyễn Thái Ngọc Duy | 2012-11-19 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'mh/ceiling' | Junio C Hamano | 2013-01-02 | 1 | -1/+2 |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | |||||
| * | | | longest_ancestor_length(): take a string_list argument for prefixes | Michael Haggerty | 2012-10-29 | 1 | -1/+1 |
| * | | | Introduce new function real_path_if_valid() | Michael Haggerty | 2012-10-29 | 1 | -0/+1 |
| | |/ | |/| | |||||
* | | | ident: keep separate "explicit" flags for author and committer | Jeff King | 2012-11-15 | 1 | -1/+2 |
* | | | ident: make user_ident_explicitly_given static | Jeff King | 2012-11-15 | 1 | -4/+0 |
| |/ |/| | |||||
* | | Move setup_diff_pager to libgit.a | Nguyễn Thái Ngọc Duy | 2012-10-29 | 1 | -0/+1 |
* | | Move try_merge_command and checkout_fast_forward to libgit.a | Nguyễn Thái Ngọc Duy | 2012-10-29 | 1 | -2/+9 |
|/ | |||||
* | ident.c: mark private file-scope symbols as static | Junio C Hamano | 2012-09-15 | 1 | -2/+0 |
* | trace.c: mark a private file-scope symbol as static | Junio C Hamano | 2012-09-15 | 1 | -1/+0 |
* | read-cache.c: mark a private file-scope symbol as static | Junio C Hamano | 2012-09-15 | 1 | -1/+0 |
* | symlinks.c: mark private file-scope symbols as static | Junio C Hamano | 2012-09-15 | 1 | -2/+0 |
* | Merge branch 'jc/maint-config-exit-status' | Junio C Hamano | 2012-09-03 | 1 | -0/+1 |
|\ | |||||
| * | config: "git config baa" should exit with status 1 | Junio C Hamano | 2012-07-30 | 1 | -0/+1 |
* | | Merge branch 'jc/capabilities' | Junio C Hamano | 2012-08-29 | 1 | -1/+3 |
|\ \ | |||||
| * | | parse_feature_request: make it easier to see feature values | Jeff King | 2012-08-13 | 1 | -1/+3 |